From 4de870530559aca870a83c04e5d1d415e3163ee4 Mon Sep 17 00:00:00 2001 From: fithwum Date: Fri, 4 Jul 2025 09:34:04 -0700 Subject: [PATCH] update --- .gitea/workflows/base-build.yml | 35 ++++++---------------------- {alpine => latest}/prepare-branch.sh | 0 2 files changed, 7 insertions(+), 28 deletions(-) rename {alpine => latest}/prepare-branch.sh (100%) diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml index 5d04e5e..04ae72c 100644 --- a/.gitea/workflows/base-build.yml +++ b/.gitea/workflows/base-build.yml @@ -18,24 +18,15 @@ jobs: run: | IMAGE_REGISTRY=gitea.fithwum.tech IMAGE_ORG=fithwum - IMAGE_REPO=debian-base + IMAGE_REPO=alpine-base # Set the tags with new naming convention - IMAGE_TAG_BUSTER=buster - IMAGE_TAG_BULLSEYE=bullseye - IMAGE_TAG_BOOKWORM=bookworm - IMAGE_TAG_DOCKER_BUILD=docker-build + IMAGE_TAG_LATEST=latest # Set full image names - IMAGE_BUSTER=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_BUSTER} - IMAGE_BULLSEYE=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_BULLSEYE} - IMAGE_BOOKWORM=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_BOOKWORM} - IMAGE_DOCKER_BUILD=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_DOCKER_BUILD} + IMAGE_LATEST=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_LATEST} - echo "IMAGE_BUSTER=${IMAGE_BUSTER}" >> $GITHUB_ENV - echo "IMAGE_BULLSEYE=${IMAGE_BULLSEYE}" >> $GITHUB_ENV - echo "IMAGE_BOOKWORM=${IMAGE_BOOKWORM}" >> $GITHUB_ENV - echo "IMAGE_DOCKER_BUILD=${IMAGE_DOCKER_BUILD}" >> $GITHUB_ENV + echo "IMAGE_LATEST=${IMAGE_LATEST}" >> $GITHUB_ENV - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -43,19 +34,7 @@ jobs: - name: Log in to Gitea Registry run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin - # Build and Push Docker Images for buster, bullseye, bookworm, docker-build - - name: Build and Push buster Docker Image + # Build and Push Docker Images for alpine + - name: Build and Push latest Docker Image run: | - docker buildx build --platform linux/amd64 --push -t ${IMAGE_BUSTER} ./buster - - - name: Build and Push bullseye Docker Image - run: | - docker buildx build --platform linux/amd64 --push -t ${IMAGE_BULLSEYE} ./bullseye - - - name: Build and Push bookworm Docker Image - run: | - docker buildx build --platform linux/amd64 --push -t ${IMAGE_BOOKWORM} ./bookworm - - - name: Build and Push docker-build Docker Image - run: | - docker buildx build --platform linux/amd64 --push -t ${IMAGE_DOCKER_BUILD} ./docker-build \ No newline at end of file + docker buildx build --platform linux/amd64 --push -t ${IMAGE_LATEST} ./latest \ No newline at end of file diff --git a/alpine/prepare-branch.sh b/latest/prepare-branch.sh similarity index 100% rename from alpine/prepare-branch.sh rename to latest/prepare-branch.sh