Skip to content

Commit

Permalink
Migrate from bullseye to bookworm
Browse files Browse the repository at this point in the history
* Pin bookworm explicitly in parent container image tags
* Update references to bullseye
  • Loading branch information
joedwards32 committed Oct 11, 2024
1 parent 78009c6 commit 573abc9
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down Expand Up @@ -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 }}
File renamed without changes.
4 changes: 2 additions & 2 deletions bullseye/Dockerfile → bookworm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# BUILD STAGE

FROM cm2network/steamcmd:root as build_stage
FROM cm2network/steamcmd:root-bookworm as build_stage

LABEL maintainer="[email protected]"

Expand Down Expand Up @@ -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 \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion bullseye/hooks/build → bookworm/hooks/build
Original file line number Diff line number Diff line change
Expand Up @@ -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}/..
2 changes: 2 additions & 0 deletions bookworm/hooks/push
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
docker push --all-tags ${DOCKER_REPO}
2 changes: 0 additions & 2 deletions bullseye/hooks/push

This file was deleted.

0 comments on commit 573abc9

Please sign in to comment.