diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e97fa6..7984668 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,8 @@ jobs: - name: Build and push uses: docker/build-push-action@v6 with: - context: ./packages/tf2-base/i386 + context: ./packages/tf2-base + file: ./packages/tf2-base/i386.Dockerfile tags: ${{ steps.docker_meta.outputs.tags }} labels: ${{ steps.docker_meta.outputs.labels }} push: true @@ -95,7 +96,8 @@ jobs: - name: Build and push uses: docker/build-push-action@v6 with: - context: ./packages/tf2-base/amd64 + context: ./packages/tf2-base + file: ./packages/tf2-base/amd64.Dockerfile tags: ${{ steps.docker_meta.outputs.tags }} labels: ${{ steps.docker_meta.outputs.labels }} push: true diff --git a/packages/tf2-base/amd64/Dockerfile b/packages/tf2-base/amd64.Dockerfile similarity index 92% rename from packages/tf2-base/amd64/Dockerfile rename to packages/tf2-base/amd64.Dockerfile index 1e6739b..1564021 100644 --- a/packages/tf2-base/amd64/Dockerfile +++ b/packages/tf2-base/amd64.Dockerfile @@ -46,13 +46,13 @@ RUN useradd --home-dir $HOME --create-home --shell /bin/bash $USER USER $USER WORKDIR $HOME -COPY ../maps_to_keep ../tf2.txt.template $HOME/ +COPY maps_to_keep tf2.txt.template $HOME/ RUN envsubst < $HOME/tf2.txt.template > $HOME/tf2.txt \ && steamcmd +runscript $HOME/tf2.txt \ && find $SERVER_DIR/tf/maps -type f | grep -v "$(cat maps_to_keep)" | xargs rm -rf \ && rm maps_to_keep -COPY ../server.cfg.template ${SERVER_DIR}/tf/cfg/server.cfg.template +COPY server.cfg.template ${SERVER_DIR}/tf/cfg/server.cfg.template COPY --from=rcon-build /build/rcon/build/rcon ${SERVER_DIR}/rcon ENV IP=0.0.0.0 @@ -70,8 +70,8 @@ ENV STV_PASSWORD= ENV DOWNLOAD_URL="https://fastdl.serveme.tf/" WORKDIR $SERVER_DIR -COPY ../entrypoint.sh . -COPY ../healthcheck.sh . +COPY entrypoint.sh . +COPY healthcheck.sh . ENTRYPOINT ["./entrypoint.sh"] CMD ["+sv_pure", "1", "+map", "cp_badlands", "+maxplayers", "24"] diff --git a/packages/tf2-base/i386/Dockerfile b/packages/tf2-base/i386.Dockerfile similarity index 93% rename from packages/tf2-base/i386/Dockerfile rename to packages/tf2-base/i386.Dockerfile index f2907ee..a8f7b90 100644 --- a/packages/tf2-base/i386/Dockerfile +++ b/packages/tf2-base/i386.Dockerfile @@ -52,7 +52,7 @@ RUN useradd --home-dir $HOME --create-home --shell /bin/bash $USER USER $USER WORKDIR $HOME -COPY ../maps_to_keep ../tf2.txt.template $HOME/ +COPY maps_to_keep tf2.txt.template $HOME/ RUN envsubst < $HOME/tf2.txt.template > $HOME/tf2.txt \ && steamcmd +runscript $HOME/tf2.txt \ && find $SERVER_DIR/tf/maps -type f | grep -v "$(cat maps_to_keep)" | xargs rm -rf \ @@ -60,7 +60,7 @@ RUN envsubst < $HOME/tf2.txt.template > $HOME/tf2.txt \ && mkdir $HOME/.steam/sdk32 \ && ln -s $HOME/.steam/steamcmd/linux32/steamclient.so $HOME/.steam/sdk32/ -COPY ../server.cfg.template ${SERVER_DIR}/tf/cfg/server.cfg.template +COPY server.cfg.template ${SERVER_DIR}/tf/cfg/server.cfg.template COPY --from=rcon-build /build/rcon/build/rcon ${SERVER_DIR}/rcon ENV IP=0.0.0.0 @@ -78,8 +78,8 @@ ENV STV_PASSWORD= ENV DOWNLOAD_URL="https://fastdl.serveme.tf/" WORKDIR $SERVER_DIR -COPY ../entrypoint.sh . -COPY ../healthcheck.sh . +COPY entrypoint.sh . +COPY healthcheck.sh . ENTRYPOINT ["./entrypoint.sh"] CMD ["+sv_pure", "1", "+map", "cp_badlands", "+maxplayers", "24"]