kenobi/prophunt-garrysmod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

= fix, docker hook context + local context should be synced now

Browse Source
This commit is contained in:
Lucas Briese
2019-10-17 10:55:04 +02:00
parent 3451ea5b48
commit 4d1de41fb8
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TTT/Dockerfile
View File

@@ -2,7 +2,7 @@ FROM jusito/docker-ttt:gmod_debian
ENV SERVER_GAMEMODE="terrortown" ENV SERVER_GAMEMODE="terrortown"
COPY "server.cfg.default" "/home/server.cfg.default" COPY "TTT/server.cfg.default" "/home/server.cfg.default"
USER "$USER_ID:$GROUP_ID" USER "$USER_ID:$GROUP_ID"

2
gmod/Dockerfile
View File

@@ -72,7 +72,7 @@ ENV CSS_PATH="/home/steam/addons/css" \
USE_MY_REPLACER_CONFIG=false USE_MY_REPLACER_CONFIG=false
COPY ["prepareServer.sh", "initConfig.sh", "forceWorkshopDownload.sh", "installAndMountAddons.sh", "common.cfg", "/home/"] COPY ["gmod/prepareServer.sh", "gmod/initConfig.sh", "gmod/forceWorkshopDownload.sh", "gmod/installAndMountAddons.sh", "gmod/common.cfg", "/home/"]
RUN chown "$DOCKER_USER:$DOCKER_USER" /home/prepareServer.sh && \ RUN chown "$DOCKER_USER:$DOCKER_USER" /home/prepareServer.sh && \
chown "$DOCKER_USER:$DOCKER_USER" /home/initConfig.sh && \ chown "$DOCKER_USER:$DOCKER_USER" /home/initConfig.sh && \

2
lgsm/Dockerfile
View File

@@ -34,7 +34,7 @@ ENTRYPOINT ["./home/entrypoint.sh"]
#WORKDIR "$STEAM_PATH" #WORKDIR "$STEAM_PATH"
COPY ["entrypoint.sh", "initCron.sh", "createAlias.sh", "/home/"] COPY ["lgsm/entrypoint.sh", "lgsm/initCron.sh", "lgsm/createAlias.sh", "/home/"]
# procps needed for ps command # procps needed for ps command
# iproute2 needed because of "-slim" # iproute2 needed because of "-slim"

8
lgsm/hooks/pre_push
View File

@@ -5,7 +5,7 @@
#set -o nounset #set -o nounset
#docker build -t "$DOCKER_REPO:lgsm_debian" "lgsm/" #docker build -t "$DOCKER_REPO:lgsm_debian" "lgsm/"
cd .. docker build -f gmod/Dockerfile -t "$DOCKER_REPO:gmod_debian" "gmod/"
docker build -t "$DOCKER_REPO:gmod_debian" "gmod/" docker build -f TTT/Dockerfile -t "$DOCKER_REPO:gmod_ttt_debian" "TTT/"
docker build -t "$DOCKER_REPO:gmod_ttt_debian" "TTT/" docker tag "$DOCKER_REPO:gmod_ttt_debian" "$DOCKER_REPO:latest"
docker build -t "$DOCKER_REPO:latest" "TTT/" docker push "$DOCKER_REPO:latest"

6
test/testBuild.sh
View File

@@ -13,10 +13,10 @@ set -o pipefail
echo "[testBuild][INFO]build" echo "[testBuild][INFO]build"
docker rmi "jusito/docker-ttt:lgsm_debian" || true docker rmi "jusito/docker-ttt:lgsm_debian" || true
docker build -t "jusito/docker-ttt:lgsm_debian" "./lgsm/" docker build -f lgsm/Dockerfile -t "jusito/docker-ttt:lgsm_debian" "."
docker rmi "jusito/docker-ttt:gmod_debian" || true docker rmi "jusito/docker-ttt:gmod_debian" || true
docker build -t "jusito/docker-ttt:gmod_debian" "./gmod/" docker build -f gmod/Dockerfile -t "jusito/docker-ttt:gmod_debian" "."
docker rmi "jusito/docker-ttt:gmod_ttt_debian" || true docker rmi "jusito/docker-ttt:gmod_ttt_debian" || true
docker build -t "jusito/docker-ttt:gmod_ttt_debian" "./TTT/" docker build -f TTT/Dockerfile -t "jusito/docker-ttt:gmod_ttt_debian" "."

2
test/testCaseQuick.sh
View File

@@ -12,7 +12,7 @@ set -o pipefail
#bash test/testStyle.sh #bash test/testStyle.sh
bash testBuild.sh bash test/testBuild.sh
echo "[testRun][INFO]running" echo "[testRun][INFO]running"