diff --git a/TTT/Dockerfile b/TTT/Dockerfile index c4d6364..a120c8a 100644 --- a/TTT/Dockerfile +++ b/TTT/Dockerfile @@ -2,7 +2,7 @@ FROM jusito/docker-ttt:gmod_debian ENV SERVER_GAMEMODE="terrortown" -COPY "TTT/server.cfg.default" "/home/server.cfg.default" +COPY "server.cfg.default" "/home/server.cfg.default" USER "$USER_ID:$GROUP_ID" diff --git a/gmod/Dockerfile b/gmod/Dockerfile index 3c737a4..8b53e27 100644 --- a/gmod/Dockerfile +++ b/gmod/Dockerfile @@ -72,7 +72,7 @@ ENV CSS_PATH="/home/steam/addons/css" \ USE_MY_REPLACER_CONFIG=false -COPY ["gmod/prepareServer.sh", "gmod/initConfig.sh", "gmod/forceWorkshopDownload.sh", "gmod/installAndMountAddons.sh", "gmod/common.cfg", "/home/"] +COPY ["prepareServer.sh", "initConfig.sh", "forceWorkshopDownload.sh", "installAndMountAddons.sh", "common.cfg", "/home/"] RUN chown "$DOCKER_USER:$DOCKER_USER" /home/prepareServer.sh && \ chown "$DOCKER_USER:$DOCKER_USER" /home/initConfig.sh && \ diff --git a/lgsm/Dockerfile b/lgsm/Dockerfile index 14ae8ba..cc9b6d7 100644 --- a/lgsm/Dockerfile +++ b/lgsm/Dockerfile @@ -34,7 +34,7 @@ ENTRYPOINT ["./home/entrypoint.sh"] #WORKDIR "$STEAM_PATH" -COPY ["lgsm/entrypoint.sh", "lgsm/initCron.sh", "lgsm/createAlias.sh", "/home/"] +COPY ["entrypoint.sh", "initCron.sh", "createAlias.sh", "/home/"] # procps needed for ps command # iproute2 needed because of "-slim" diff --git a/lgsm/hooks/pre_build b/lgsm/hooks/pre_build index a5a8023..abdf6ca 100644 --- a/lgsm/hooks/pre_build +++ b/lgsm/hooks/pre_build @@ -4,4 +4,5 @@ #set -o pipefail #set -o nounset -ls -lA \ No newline at end of file +ls -lA +ls -lA .. \ No newline at end of file diff --git a/lgsm/hooks/pre_push b/lgsm/hooks/pre_push index 21927ed..3aa7369 100644 --- a/lgsm/hooks/pre_push +++ b/lgsm/hooks/pre_push @@ -4,12 +4,14 @@ #set -o pipefail #set -o nounset -ls -lA - #docker build -t "$DOCKER_REPO:lgsm_debian" "lgsm/" -docker build -f gmod/Dockerfile -t "$DOCKER_REPO:gmod_debian" "." -docker build -f TTT/Dockerfile -t "$DOCKER_REPO:gmod_ttt_debian" "." +cd .. +docker build -t "$DOCKER_REPO:gmod_debian" "gmod/" +docker build -t "$DOCKER_REPO:gmod_ttt_debian" "TTT/" docker tag "$DOCKER_REPO:gmod_ttt_debian" "$DOCKER_REPO:latest" -docker push "$DOCKER_REPO:latest" + docker push "$DOCKER_REPO:gmod_debian" docker push "$DOCKER_REPO:gmod_ttt_debian" +docker push "$DOCKER_REPO:latest" + + diff --git a/test/testBuild.sh b/test/testBuild.sh index 212076c..6d0daf7 100644 --- a/test/testBuild.sh +++ b/test/testBuild.sh @@ -13,10 +13,10 @@ set -o pipefail echo "[testBuild][INFO]build" docker rmi "jusito/docker-ttt:lgsm_debian" || true -docker build -f lgsm/Dockerfile -t "jusito/docker-ttt:lgsm_debian" "." +docker build -t "jusito/docker-ttt:lgsm_debian" "lgsm/" docker rmi "jusito/docker-ttt:gmod_debian" || true -docker build -f gmod/Dockerfile -t "jusito/docker-ttt:gmod_debian" "." +docker build -t "jusito/docker-ttt:gmod_debian" "gmod/" docker rmi "jusito/docker-ttt:gmod_ttt_debian" || true -docker build -f TTT/Dockerfile -t "jusito/docker-ttt:gmod_ttt_debian" "." \ No newline at end of file +docker build -t "jusito/docker-ttt:gmod_ttt_debian" "TTT/" \ No newline at end of file