From 573abc9a49209c10f6b2022ec64779a4fd4980d0 Mon Sep 17 00:00:00 2001
From: John Edwards <joedwards32@gmail.com>
Date: Fri, 11 Oct 2024 17:12:32 +0100
Subject: [PATCH] Migrate from bullseye to bookworm

* Pin bookworm explicitly in parent container image tags
* Update references to bullseye
---
 .github/workflows/docker-image.yml    | 2 +-
 .github/workflows/docker-publish.yml  | 6 +++---
 {bullseye => bookworm}/.dockerignore  | 0
 {bullseye => bookworm}/Dockerfile     | 4 ++--
 {bullseye => bookworm}/etc/entry.sh   | 0
 {bullseye => bookworm}/etc/post.sh    | 0
 {bullseye => bookworm}/etc/pre.sh     | 0
 {bullseye => bookworm}/etc/server.cfg | 0
 {bullseye => bookworm}/hooks/build    | 2 +-
 bookworm/hooks/push                   | 2 ++
 bullseye/hooks/push                   | 2 --
 11 files changed, 9 insertions(+), 9 deletions(-)
 rename {bullseye => bookworm}/.dockerignore (100%)
 rename {bullseye => bookworm}/Dockerfile (95%)
 rename {bullseye => bookworm}/etc/entry.sh (100%)
 rename {bullseye => bookworm}/etc/post.sh (100%)
 rename {bullseye => bookworm}/etc/pre.sh (100%)
 rename {bullseye => bookworm}/etc/server.cfg (100%)
 rename {bullseye => bookworm}/hooks/build (66%)
 create mode 100644 bookworm/hooks/push
 delete mode 100644 bullseye/hooks/push

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 7c5af2c..3c0bd87 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -15,5 +15,5 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Build the Docker image
-      working-directory: ./bullseye
+      working-directory: ./bookworm
       run: docker build . --file Dockerfile --tag joedwards32/cs2:latest
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 0b4b673..7be7013 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -17,7 +17,7 @@ on:
 
 env:
   # Use docker.io for Docker Hub if empty
-  REGISTRY: docker.io 
+  REGISTRY: docker.io
   # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
 
@@ -62,8 +62,8 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
-          context: ./bullseye
-          file: ./bullseye/Dockerfile
+          context: ./bookworm
+          file: ./bookworm/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/bullseye/.dockerignore b/bookworm/.dockerignore
similarity index 100%
rename from bullseye/.dockerignore
rename to bookworm/.dockerignore
diff --git a/bullseye/Dockerfile b/bookworm/Dockerfile
similarity index 95%
rename from bullseye/Dockerfile
rename to bookworm/Dockerfile
index 95cefa6..98cb3f9 100644
--- a/bullseye/Dockerfile
+++ b/bookworm/Dockerfile
@@ -4,7 +4,7 @@
 
 # BUILD STAGE
 
-FROM cm2network/steamcmd:root as build_stage
+FROM cm2network/steamcmd:root-bookworm as build_stage
 
 LABEL maintainer="joedwards32@gmail.com"
 
@@ -39,7 +39,7 @@ RUN set -x \
 
 # BASE
 
-FROM build_stage AS bullseye-base
+FROM build_stage AS bookworm-base
 
 ENV CS2_SERVERNAME="cs2 private server" \
     CS2_CHEATS=0 \
diff --git a/bullseye/etc/entry.sh b/bookworm/etc/entry.sh
similarity index 100%
rename from bullseye/etc/entry.sh
rename to bookworm/etc/entry.sh
diff --git a/bullseye/etc/post.sh b/bookworm/etc/post.sh
similarity index 100%
rename from bullseye/etc/post.sh
rename to bookworm/etc/post.sh
diff --git a/bullseye/etc/pre.sh b/bookworm/etc/pre.sh
similarity index 100%
rename from bullseye/etc/pre.sh
rename to bookworm/etc/pre.sh
diff --git a/bullseye/etc/server.cfg b/bookworm/etc/server.cfg
similarity index 100%
rename from bullseye/etc/server.cfg
rename to bookworm/etc/server.cfg
diff --git a/bullseye/hooks/build b/bookworm/hooks/build
similarity index 66%
rename from bullseye/hooks/build
rename to bookworm/hooks/build
index cfffa83..16d5f3b 100644
--- a/bullseye/hooks/build
+++ b/bookworm/hooks/build
@@ -2,4 +2,4 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
  
-docker build --target=bullseye-base -t $DOCKER_REPO:latest -t $DOCKER_REPO:base ${SCRIPT_DIR}/..
+docker build --target=bookworm-base -t $DOCKER_REPO:latest -t $DOCKER_REPO:base ${SCRIPT_DIR}/..
diff --git a/bookworm/hooks/push b/bookworm/hooks/push
new file mode 100644
index 0000000..51252bc
--- /dev/null
+++ b/bookworm/hooks/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push --all-tags ${DOCKER_REPO}
diff --git a/bullseye/hooks/push b/bullseye/hooks/push
deleted file mode 100644
index 93a8d0d..0000000
--- a/bullseye/hooks/push
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker push --all-tags ${DOCKER_REPO}