From 578c307359732ad755fa035bd4082333a9af3849 Mon Sep 17 00:00:00 2001 From: Joel Timothy Oh Date: Mon, 4 Dec 2023 12:47:06 +0000 Subject: [PATCH] Enhancement (ci): Add `-layered-` tag for layered image Co-authored-by: leo --- README.md | 3 ++- build.sh | 18 +++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 02bfc7c0..2eaf9d1a 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ * `latest` [(*/build/Dockerfile*)][dockerfile-build-link], [(*/update/Dockerfile*)][dockerfile-update-link] * `` [(*/build/Dockerfile*)][dockerfile-build-link] * `-layered` [(*/update/Dockerfile*)][dockerfile-update-link] +* `-layered-` [(*/update/Dockerfile*)][dockerfile-update-link] [dockerfile-build-link]: https://github.com/startersclan/docker-sourceservers/blob/master/build/Dockerfile [dockerfile-update-link]: https://github.com/startersclan/docker-sourceservers/blob/master/update/Dockerfile @@ -159,7 +160,7 @@ Dedicated servers hosted on Steam are usually required to be running the *latest ### Game versions & tags -A *layered* image of a game is but a *clean* image compounded with game update layers. *Clean* images are tagged by ``, while *layered* images are tagged by `-layered`. +A *layered* image of a game is but a *clean* image compounded with game update layers. *Clean* images are tagged by ``, while *layered* images are tagged by `-layered` and `-layered-`. The `latest` tag of each game points to the game's newest *layered* image unless a newer *clean* image has been built with the `latest` tag. Thus, by using the `latest` tag, *layered* images are almost always used, circumventing the need to pull entire *clean* images for obtaining game updates. diff --git a/build.sh b/build.sh index 81e14e76..ad0090af 100755 --- a/build.sh +++ b/build.sh @@ -191,6 +191,7 @@ if [ "$PIPELINE" = 'build' ]; then BUILD_CONTEXT='build/' elif [ "$PIPELINE" = 'update' ]; then GAME_IMAGE_LAYERED="$DOCKER_REPOSITORY:$GAME_VERSION-layered" + GAME_IMAGE_LAYERED_CALVER="$GAME_IMAGE_LAYERED-$( date -u '+%Y%m%d' )" BUILD_CONTEXT='update/' fi GAME_IMAGE_LATEST="$DOCKER_REPOSITORY:latest" @@ -222,10 +223,9 @@ fi # Build / Update the game image if [ "$PIPELINE" = 'build' ]; then - GAME_IMAGE="$GAME_IMAGE_CLEAN" if [ "$CACHE" = 'true' ]; then date -Iseconds - time docker pull "$GAME_IMAGE" || true + time docker pull "$GAME_IMAGE_CLEAN" || true fi date -Iseconds STEAM_USERNAME="$STEAM_USERNAME" STEAM_PASSWORD="$STEAM_PASSWORD" time docker build \ @@ -240,7 +240,7 @@ if [ "$PIPELINE" = 'build' ]; then --build-arg INSTALL_COUNT="$INSTALL_COUNT" \ --build-arg STEAM_LOGIN="$STEAM_LOGIN" \ --build-arg CACHE_KEY="$GAME_VERSION" \ - -t "$GAME_IMAGE" \ + -t "$GAME_IMAGE_CLEAN" \ --label "appid=$APPID" \ --label "mod=$MOD" \ --label "client_appid=$CLIENT_APPID" \ @@ -252,11 +252,11 @@ if [ "$PIPELINE" = 'build' ]; then --label "commit_sha=$COMMIT_SHA" \ "$BUILD_CONTEXT" if [ "$LATEST" = 'true' ]; then - docker tag "$GAME_IMAGE" "$GAME_IMAGE_LATEST" + docker tag "$GAME_IMAGE_CLEAN" "$GAME_IMAGE_LATEST" fi date -Iseconds + GAME_IMAGE="$GAME_IMAGE_CLEAN" elif [ "$PIPELINE" = 'update' ]; then - GAME_IMAGE="$GAME_IMAGE_LAYERED" date -Iseconds if [ ! "$NO_PULL" = 'true' ]; then time docker pull "$GAME_IMAGE_LATEST" @@ -271,13 +271,15 @@ elif [ "$PIPELINE" = 'update' ]; then --build-arg INSTALL_COUNT="$INSTALL_COUNT" \ --build-arg STEAM_LOGIN="$STEAM_LOGIN" \ --build-arg CACHE_KEY="$GAME_VERSION" \ - -t "$GAME_IMAGE" \ + -t "$GAME_IMAGE_LAYERED" \ + -t "$GAME_IMAGE_LAYERED_CALVER" \ -t "$GAME_IMAGE_LATEST" \ --label "game_version=$GAME_VERSION" \ --label "game_update_count=$GAME_UPDATE_COUNT" \ --label "commit_sha=$COMMIT_SHA" \ "$BUILD_CONTEXT" date -Iseconds + GAME_IMAGE="$GAME_IMAGE_LAYERED" fi docker images docker inspect "$GAME_IMAGE" @@ -331,12 +333,14 @@ fi # Push the game image if [ ! "$NO_PUSH" = 'true' ]; then date -Iseconds - time docker push "$GAME_IMAGE" if [ "$PIPELINE" = 'build' ]; then + time docker push "$GAME_IMAGE_CLEAN" if [ "$LATEST" = 'true' ]; then time docker push "$GAME_IMAGE_LATEST" fi elif [ "$PIPELINE" = 'update' ]; then + time docker push "$GAME_IMAGE_LAYERED" + time docker push "$GAME_IMAGE_LAYERED_CALVER" time docker push "$GAME_IMAGE_LATEST" fi date -Iseconds