update

.gitea/workflows/base-build.yml

@@ -5,10 +5,10 @@ on:
     branches:
       - main
     paths:
-      - 'debian/buster/**'
+      - 'buster/**'
-      - 'debian/bullseye/**'
+      - 'bullseye/**'
-      - 'debian/bookworm/**'
+      - 'bookworm/**'
-      - 'debian/docker-build/**'
+      - 'docker-build/**'
 
 jobs:
   build:
@@ -23,25 +23,19 @@ jobs:
         run: |
           IMAGE_REGISTRY=gitea.fithwum.tech
           IMAGE_ORG=fithwum
-          IMAGE_REPO=base-image
+          IMAGE_REPO=debian-base
-          IMAGE_NAME=debian
           
-          # 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
+          # Set full image names
-          echo "IMAGE_TAG_BULLSEYE=${IMAGE_TAG_BULLSEYE}" >> $GITHUB_ENV
+          IMAGE_BUSTER=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_BUSTER}
-          echo "IMAGE_TAG_BOOKWORM=${IMAGE_TAG_BOOKWORM}" >> $GITHUB_ENV
+          IMAGE_BULLSEYE=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_BULLSEYE}
-          echo "IMAGE_TAG_DOCKER_BUILD=${IMAGE_TAG_DOCKER_BUILD}" >> $GITHUB_ENV
+          IMAGE_BOOKWORM=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_BOOKWORM}
-          
+          IMAGE_DOCKER_BUILD=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_DOCKER_BUILD}
-          # 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}
 
           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
+          docker buildx build --platform linux/amd64 --push -t ${IMAGE_DOCKER_BUILD} ./docker-build