Skip to content

Allow passing arguments with normal arguments #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EXtremeExploit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow passing arguments with normal arguments #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* \
&& groupadd -r -g 999 warfork && useradd -r -m -g warfork -u 999 warfork


COPY entrypoint.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/entrypoint.sh
COPY entrypointtv.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/entrypointtv.sh

USER warfork

RUN mkdir -p /home/warfork/Steam && \
Expand All @@ -52,8 +58,4 @@ RUN wget -qO- https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.ta
RUN ln -s /home/warfork/Steam/linux64 /home/warfork/.steam/sdk64 && \
ln -s /home/warfork/Steam/linux32 /home/warfork/.steam/sdk32

COPY entrypoint.sh /usr/local/bin/

COPY entrypointtv.sh /usr/local/bin/

CMD [ "bash", "/usr/local/bin/entrypoint.sh" ]
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
6 changes: 4 additions & 2 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ server_dir="${HOME}/server"
server_installed_lock_file="${server_dir}/installed.lock"
wf_dir="${server_dir}/basewf"
wf_custom_configs_dir="${WF_CUSTOM_CONFIGS_DIR-"/var/wf"}"
wf_arguments="$@"


install() {
echo '> Installing server ...'
Expand Down Expand Up @@ -62,7 +64,7 @@ start() {

exec ./wf_server.x86_64 \
$optionalParameters \
$WF_PARAMS
$WF_PARAMS $wf_arguments
}

update() {
Expand Down Expand Up @@ -111,4 +113,4 @@ else
install_or_update
sync_custom_files
start
fi
fi