From 7514e20fb3463a2ef18646ae70f8c1762414a8dc Mon Sep 17 00:00:00 2001 From: fithwum Date: Thu, 3 Jul 2025 12:25:20 -0700 Subject: [PATCH] update --- .gitea/workflows/base-build.yml | 36 ++++++++---------- {debian/bookworm => bookworm}/Dockerfile | 0 .../debian-bookworm.tar.bz2 | Bin {debian/bullseye => bullseye}/Dockerfile | 0 .../debian-bullseye.tar.bz2 | Bin {debian/buster => buster}/Dockerfile | 0 .../buster => buster}/debian-buster.tar.bz2 | Bin .../docker-build => docker-build}/Dockerfile | 0 .../debian-docker-build.tar.bz2 | Bin 9 files changed, 15 insertions(+), 21 deletions(-) rename {debian/bookworm => bookworm}/Dockerfile (100%) rename {debian/bookworm => bookworm}/debian-bookworm.tar.bz2 (100%) rename {debian/bullseye => bullseye}/Dockerfile (100%) rename {debian/bullseye => bullseye}/debian-bullseye.tar.bz2 (100%) rename {debian/buster => buster}/Dockerfile (100%) rename {debian/buster => buster}/debian-buster.tar.bz2 (100%) rename {debian/docker-build => docker-build}/Dockerfile (100%) rename {debian/docker-build => docker-build}/debian-docker-build.tar.bz2 (100%) diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml index 6ae47da..79d4935 100644 --- a/.gitea/workflows/base-build.yml +++ b/.gitea/workflows/base-build.yml @@ -5,10 +5,10 @@ on: branches: - main paths: - - 'debian/buster/**' - - 'debian/bullseye/**' - - 'debian/bookworm/**' - - 'debian/docker-build/**' + - 'buster/**' + - 'bullseye/**' + - 'bookworm/**' + - 'docker-build/**' jobs: build: @@ -23,25 +23,19 @@ jobs: run: | IMAGE_REGISTRY=gitea.fithwum.tech IMAGE_ORG=fithwum - IMAGE_REPO=base-image - IMAGE_NAME=debian + IMAGE_REPO=debian-base - # Set the tag based on the folder name (buster, bullseye, bookworm, docker-build) + # 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 - echo "IMAGE_TAG_BUSTER=${IMAGE_TAG_BUSTER}" >> $GITHUB_ENV - echo "IMAGE_TAG_BULLSEYE=${IMAGE_TAG_BULLSEYE}" >> $GITHUB_ENV - echo "IMAGE_TAG_BOOKWORM=${IMAGE_TAG_BOOKWORM}" >> $GITHUB_ENV - echo "IMAGE_TAG_DOCKER_BUILD=${IMAGE_TAG_DOCKER_BUILD}" >> $GITHUB_ENV - - # Set image names for each subfolder Dockerfile - IMAGE_BUSTER=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG_BUSTER} - IMAGE_BULLSEYE=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG_BULLSEYE} - IMAGE_BOOKWORM=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG_BOOKWORM} - IMAGE_DOCKER_BUILD=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG_DOCKER_BUILD} + # 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} echo "IMAGE_BUSTER=${IMAGE_BUSTER}" >> $GITHUB_ENV echo "IMAGE_BULLSEYE=${IMAGE_BULLSEYE}" >> $GITHUB_ENV @@ -57,16 +51,16 @@ jobs: # Build and Push Docker Images for buster, bullseye, bookworm, docker-build - name: Build and Push buster Docker Image run: | - docker buildx build --platform linux/amd64,linux/arm64 --push -t ${IMAGE_BUSTER} ./debian/buster + 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} ./debian/bullseye + 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} ./debian/bookworm + 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} ./debian/docker-build \ No newline at end of file + docker buildx build --platform linux/amd64 --push -t ${IMAGE_DOCKER_BUILD} ./docker-build \ No newline at end of file diff --git a/debian/bookworm/Dockerfile b/bookworm/Dockerfile similarity index 100% rename from debian/bookworm/Dockerfile rename to bookworm/Dockerfile diff --git a/debian/bookworm/debian-bookworm.tar.bz2 b/bookworm/debian-bookworm.tar.bz2 similarity index 100% rename from debian/bookworm/debian-bookworm.tar.bz2 rename to bookworm/debian-bookworm.tar.bz2 diff --git a/debian/bullseye/Dockerfile b/bullseye/Dockerfile similarity index 100% rename from debian/bullseye/Dockerfile rename to bullseye/Dockerfile diff --git a/debian/bullseye/debian-bullseye.tar.bz2 b/bullseye/debian-bullseye.tar.bz2 similarity index 100% rename from debian/bullseye/debian-bullseye.tar.bz2 rename to bullseye/debian-bullseye.tar.bz2 diff --git a/debian/buster/Dockerfile b/buster/Dockerfile similarity index 100% rename from debian/buster/Dockerfile rename to buster/Dockerfile diff --git a/debian/buster/debian-buster.tar.bz2 b/buster/debian-buster.tar.bz2 similarity index 100% rename from debian/buster/debian-buster.tar.bz2 rename to buster/debian-buster.tar.bz2 diff --git a/debian/docker-build/Dockerfile b/docker-build/Dockerfile similarity index 100% rename from debian/docker-build/Dockerfile rename to docker-build/Dockerfile diff --git a/debian/docker-build/debian-docker-build.tar.bz2 b/docker-build/debian-docker-build.tar.bz2 similarity index 100% rename from debian/docker-build/debian-docker-build.tar.bz2 rename to docker-build/debian-docker-build.tar.bz2