Merge pull request #132 from joedwards32/129-upgrade-to-debian-bookworm-version-of-steamcmd
Migrate from bullseye to bookworm
This commit is contained in:
commit
bda25a1d4b
11 changed files with 9 additions and 9 deletions
2
.github/workflows/docker-image.yml
vendored
2
.github/workflows/docker-image.yml
vendored
|
@ -15,5 +15,5 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Build the Docker image
|
- name: Build the Docker image
|
||||||
working-directory: ./bullseye
|
working-directory: ./bookworm
|
||||||
run: docker build . --file Dockerfile --tag joedwards32/cs2:latest
|
run: docker build . --file Dockerfile --tag joedwards32/cs2:latest
|
||||||
|
|
4
.github/workflows/docker-publish.yml
vendored
4
.github/workflows/docker-publish.yml
vendored
|
@ -62,8 +62,8 @@ jobs:
|
||||||
- name: Build and push Docker image
|
- name: Build and push Docker image
|
||||||
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
|
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
|
||||||
with:
|
with:
|
||||||
context: ./bullseye
|
context: ./bookworm
|
||||||
file: ./bullseye/Dockerfile
|
file: ./bookworm/Dockerfile
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: ${{ github.event_name != 'pull_request' }}
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
# BUILD STAGE
|
# BUILD STAGE
|
||||||
|
|
||||||
FROM cm2network/steamcmd:root as build_stage
|
FROM cm2network/steamcmd:root-bookworm as build_stage
|
||||||
|
|
||||||
LABEL maintainer="joedwards32@gmail.com"
|
LABEL maintainer="joedwards32@gmail.com"
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ RUN set -x \
|
||||||
|
|
||||||
# BASE
|
# BASE
|
||||||
|
|
||||||
FROM build_stage AS bullseye-base
|
FROM build_stage AS bookworm-base
|
||||||
|
|
||||||
ENV CS2_SERVERNAME="cs2 private server" \
|
ENV CS2_SERVERNAME="cs2 private server" \
|
||||||
CS2_CHEATS=0 \
|
CS2_CHEATS=0 \
|
|
@ -2,4 +2,4 @@
|
||||||
|
|
||||||
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
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
2
bookworm/hooks/push
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
#!/bin/bash
|
||||||
|
docker push --all-tags ${DOCKER_REPO}
|
|
@ -1,2 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
docker push --all-tags ${DOCKER_REPO}
|
|
Loading…
Add table
Add a link
Reference in a new issue