Skip to content

Commit 233e6ce

Browse files
committed
ci(docker): centralize base image version management
1 parent eb70865 commit 233e6ce

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

.base-image-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python3.12-20260407

.github/workflows/build-and-push-base.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
run: |
3030
DOCKER_IMAGE=ghcr.io/1panel-dev/clawswarm-base
3131
DOCKER_PLATFORMS=${{ github.event.inputs.architecture }}
32-
TAG_NAME=python3.12-20260401
33-
DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME}"
32+
TAG_NAME=$(tr -d '\n' < .base-image-version)
33+
DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
3434
{
3535
echo "docker_image=${DOCKER_IMAGE}"
3636
echo "version=${TAG_NAME}"

.github/workflows/build-and-push.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ on:
3232
- testing
3333
- production
3434

35-
env:
36-
CLAWSWARM_BASE_IMAGE: ghcr.io/1panel-dev/clawswarm-base:python3.12-20260401
37-
3835
jobs:
3936
build-and-push-to-dockerhub:
4037
runs-on: ubuntu-latest
@@ -52,6 +49,8 @@ jobs:
5249
- name: Prepare
5350
id: prepare
5451
run: |
52+
BASE_IMAGE_TAG=$(tr -d '\n' < .base-image-version)
53+
CLAWSWARM_BASE_IMAGE=ghcr.io/1panel-dev/clawswarm-base:${BASE_IMAGE_TAG}
5554
if [[ "${{ github.event.inputs.dockerhubAccount }}" == "testing" ]]; then
5655
DOCKER_NAMESPACE="${{ secrets.DOCKERHUB_USERNAME_PERSONAL }}"
5756
else

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_IMAGE=ghcr.io/1panel-dev/clawswarm-base:python3.12-20260407
1+
ARG BASE_IMAGE=ghcr.io/1panel-dev/clawswarm-base:latest
22

33
FROM node:22-bookworm-slim AS web-build
44

0 commit comments

Comments
 (0)