Merge pull request #132 from joedwards32/129-upgrade-to-debian-bookworm-version-of-steamcmd

Migrate from bullseye to bookworm
This commit is contained in:
John Edwards 2024-10-27 13:10:36 +00:00 committed by GitHub
commit bda25a1d4b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 9 additions and 9 deletions

View file

@ -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

View file

@ -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 }}

View file

@ -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 \

View file

@ -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
bookworm/hooks/push Normal file
View file

@ -0,0 +1,2 @@
#!/bin/bash
docker push --all-tags ${DOCKER_REPO}

View file

@ -1,2 +0,0 @@
#!/bin/bash
docker push --all-tags ${DOCKER_REPO}