fixes
All checks were successful
Publish / build_and_publish_docker_image (push) Successful in 2m12s
All checks were successful
Publish / build_and_publish_docker_image (push) Successful in 2m12s
This commit is contained in:
parent
010d8553f1
commit
2f0c5eb028
13
Dockerfile
13
Dockerfile
@ -16,8 +16,12 @@ RUN apt update -y \
|
|||||||
tini \
|
tini \
|
||||||
zip \
|
zip \
|
||||||
unzip \
|
unzip \
|
||||||
nodejs
|
gnupg
|
||||||
|
##nodejs \
|
||||||
|
##npm
|
||||||
|
|
||||||
|
RUN curl -fsSL https://deb.nodesource.com/setup_23.x | bash - && \
|
||||||
|
apt install -y nodejs
|
||||||
|
|
||||||
## Setup user and working directory
|
## Setup user and working directory
|
||||||
RUN useradd -m -d /home/container -s /bin/bash container
|
RUN useradd -m -d /home/container -s /bin/bash container
|
||||||
@ -25,12 +29,13 @@ USER container
|
|||||||
ENV USER=container HOME=/home/container
|
ENV USER=container HOME=/home/container
|
||||||
WORKDIR /home/container
|
WORKDIR /home/container
|
||||||
RUN git clone https://github.com/ThePansmith/Monifactory.git
|
RUN git clone https://github.com/ThePansmith/Monifactory.git
|
||||||
RUN node ~/Monifactory/tools/build server-build
|
RUN cd ~/Monifactory/tools/build && npm install
|
||||||
RUN cp ~/Monifactory/dist/server/* ~
|
##RUN node ~/Monifactory/tools/build build-server
|
||||||
|
##RUN cp ~/Monifactory/dist/server/* ~
|
||||||
|
|
||||||
STOPSIGNAL SIGINT
|
STOPSIGNAL SIGINT
|
||||||
|
|
||||||
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
|
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
|
||||||
RUN chmod +x /entrypoint.sh
|
RUN chmod +x /entrypoint.sh
|
||||||
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
|
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
|
||||||
CMD ["/entrypoint.sh"]
|
CMD ["/entrypoint.sh"]
|
||||||
|
|||||||
61
entrypoint.sh
Normal file
61
entrypoint.sh
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
#
|
||||||
|
# Copyright (c) 2021 Matthew Penner
|
||||||
|
#
|
||||||
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
# of this software and associated documentation files (the "Software"), to deal
|
||||||
|
# in the Software without restriction, including without limitation the rights
|
||||||
|
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
# copies of the Software, and to permit persons to whom the Software is
|
||||||
|
# furnished to do so, subject to the following conditions:
|
||||||
|
#
|
||||||
|
# The above copyright notice and this permission notice shall be included in all
|
||||||
|
# copies or substantial portions of the Software.
|
||||||
|
#
|
||||||
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
# SOFTWARE.
|
||||||
|
#
|
||||||
|
|
||||||
|
# Default the TZ environment variable to UTC.
|
||||||
|
TZ=${TZ:-UTC}
|
||||||
|
export TZ
|
||||||
|
|
||||||
|
# Set environment variable that holds the Internal Docker IP
|
||||||
|
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||||
|
export INTERNAL_IP
|
||||||
|
|
||||||
|
|
||||||
|
cd /home/container/Monifactory
|
||||||
|
git pull
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Switch to the container's working directory
|
||||||
|
cd /home/container || exit 1
|
||||||
|
|
||||||
|
|
||||||
|
rm -R config/ defaultconfigs/ config-overrides/ kubejs/ mods/
|
||||||
|
node ./Monifactory/tools/build build-server
|
||||||
|
cp ./Monifactory/dist/server/* .
|
||||||
|
|
||||||
|
|
||||||
|
# Print Java version
|
||||||
|
printf "\033[1m\033[33mcontainer@pelican~ \033[0mjava -version\n"
|
||||||
|
java -version
|
||||||
|
|
||||||
|
# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
|
||||||
|
# variable format of "${VARIABLE}" before evaluating the string and automatically
|
||||||
|
# replacing the values.
|
||||||
|
PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||||
|
|
||||||
|
# Display the command we're running in the output, and then execute it with eval
|
||||||
|
printf "\033[1m\033[33mcontainer@pelican~ \033[0m"
|
||||||
|
echo "$PARSED"
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
eval "$PARSED"
|
||||||
1
node_modules/undefined
generated
vendored
Symbolic link
1
node_modules/undefined
generated
vendored
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
../../Monifactory/tools/build
|
||||||
Loading…
Reference in New Issue
Block a user