updates

2025-07-03 07:22:06 -07:00
parent 8cc744743b
commit 3711cffb1f
10 changed files with 8 additions and 114 deletions
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -5,10 +5,6 @@ on:
    branches:
      - main
    paths:
-      - 'debian/buster/Dockerfile'
-      - 'debian/bullseye/Dockerfile'
-      - 'debian/bookworm/Dockerfile'
-      - 'debian/docker-build/Dockerfile'
      - 'debian/buster/**'
      - 'debian/bullseye/**'
      - 'debian/bookworm/**'
@@ -61,24 +57,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,linux/arm64 --push -t ${IMAGE_BUSTER} ./debian/buster

      - name: Build and Push bullseye Docker Image
        run: |
-          docker buildx build --platform linux/amd64,linux/arm64 \
-            --push -t ${IMAGE_BULLSEYE} \
-            ./debian/bullseye
+          docker buildx build --platform linux/amd64 --push -t ${IMAGE_BULLSEYE} ./debian/bullseye

      - name: Build and Push bookworm Docker Image
        run: |
-          docker buildx build --platform linux/amd64,linux/arm64 \
-            --push -t ${IMAGE_BOOKWORM} \
-            ./debian/bookworm
+          docker buildx build --platform linux/amd64 --push -t ${IMAGE_BOOKWORM} ./debian/bookworm

      - name: Build and Push docker-build Docker Image
        run: |
-          docker buildx build --platform linux/amd64,linux/arm64 \
-            --push -t ${IMAGE_DOCKER_BUILD} \
-            ./debian/docker-build
+          docker buildx build --platform linux/amd64 --push -t ${IMAGE_DOCKER_BUILD} ./debian/docker-build
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +0,0 @@
-image: docker:24.0.7
-
-variables:
-    IMAGE_NAME: "base-image"
-    DOCKER_HOST: ""
-    DOCKER_TLS_CERTDIR: ""
-    DOCKER_CERT_PATH: ""
-    DOCKER_DRIVER: overlay2
-    GIT_SSL_NO_VERIFY: true
-
-services:
-    - name: docker:24.0.7-dind-rootless
-      command: ["--tls=false"]
-
-default:
-  before_script:
-    - docker info
-
-include:
-    - "/debian/bookworm/.pipeline.yml"
-    - "/debian/bullseye/.pipeline.yml"
-    - "/debian/buster/.pipeline.yml"
--- a/debian/bookworm/.pipeline.yml
+++ b/debian/bookworm/.pipeline.yml
@@ -1,18 +0,0 @@
-variables:
-    IMAGE_TAG: "debian-bookworm"
-    DOCKER_HOST: ""
-    DOCKER_DRIVER: overlay2
-
-build_image:
-    image: docker:24.0.7
-    services:
-      - docker:24.0.7-dind-rootless
-    variables:
-      DOCKER_TLS_CERTDIR: ""
-      GIT_SSL_NO_VERIFY: true
-    before_script:
-      - docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
-    script:
-      - cd "$CI_PROJECT_DIR/debian/bookworm/"
-      - docker build -t $CI_REGISTRY/fithwum/base-image/$IMAGE_NAME:$IMAGE_TAG .
-      - docker push -a $CI_REGISTRY/fithwum/base-image/$IMAGE_NAME
--- a/debian/bookworm/Dockerfile
+++ b/debian/bookworm/Dockerfile
@@ -1,4 +1,4 @@
 FROM scratch
-LABEL maintainer "fithwum"
+LABEL maintainer="fithwum"
 ADD /debian-bookworm.tar.bz2 /
 CMD ["/bin/bash"]
--- a/debian/bullseye/.pipeline.yml
+++ b/debian/bullseye/.pipeline.yml
@@ -1,18 +0,0 @@
-variables:
-    IMAGE_TAG: "debian-bullseye"
-    DOCKER_HOST: ""
-    DOCKER_DRIVER: overlay2
-
-build_image:
-    image: docker:24.0.7
-    services:
-      - docker:24.0.7-dind-rootless
-    variables:
-      DOCKER_TLS_CERTDIR: ""
-      GIT_SSL_NO_VERIFY: true
-    before_script:
-      - docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
-    script:
-      - cd "$CI_PROJECT_DIR/debian/bullseye/"
-      - docker build -t $CI_REGISTRY/fithwum/base-image/$IMAGE_NAME:$IMAGE_TAG .
-      - docker push -a $CI_REGISTRY/fithwum/base-image/$IMAGE_NAME
--- a/debian/bullseye/Dockerfile
+++ b/debian/bullseye/Dockerfile
@@ -1,4 +1,4 @@
 FROM scratch
-LABEL maintainer "fithwum"
+LABEL maintainer="fithwum"
 ADD /debian-bullseye.tar.bz2 /
 CMD ["/bin/bash"]
--- a/debian/buster/.pipeline.yml
+++ b/debian/buster/.pipeline.yml
@@ -1,18 +0,0 @@
-variables:
-    IMAGE_TAG: "debian-buster"
-    DOCKER_HOST: ""
-    DOCKER_DRIVER: overlay2
-
-build_image:
-    image: docker:24.0.7
-    services:
-      - docker:24.0.7-dind-rootless
-    variables:
-      DOCKER_TLS_CERTDIR: ""
-      GIT_SSL_NO_VERIFY: true
-    before_script:
-      - docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
-    script:
-      - cd "$CI_PROJECT_DIR/debian/buster/"
-      - docker build -t $CI_REGISTRY/fithwum/base-image/$IMAGE_NAME:$IMAGE_TAG .
-      - docker push -a $CI_REGISTRY/fithwum/base-image/$IMAGE_NAME
--- a/debian/buster/Dockerfile
+++ b/debian/buster/Dockerfile
@@ -1,4 +1,4 @@
 FROM scratch
-LABEL maintainer "fithwum"
+LABEL maintainer="fithwum"
 ADD /debian-buster.tar.bz2 /
 CMD ["/bin/bash"]
--- a/debian/docker-build/.pipeline.yml
+++ b/debian/docker-build/.pipeline.yml
@@ -1,18 +0,0 @@
-variables:
-    IMAGE_TAG: "debian-docker-build"
-    DOCKER_HOST: ""
-    DOCKER_DRIVER: overlay2
-
-build_image:
-    image: docker:24.0.7
-    services:
-      - docker:24.0.7-dind-rootless
-    variables:
-      DOCKER_TLS_CERTDIR: ""
-      GIT_SSL_NO_VERIFY: true
-    before_script:
-      - docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
-    script:
-      - cd "$CI_PROJECT_DIR/debian/docker-build/"
-      - docker build -t $CI_REGISTRY/fithwum/base-image/$IMAGE_NAME:$IMAGE_TAG .
-      - docker push -a $CI_REGISTRY/fithwum/base-image/$IMAGE_NAME
--- a/debian/docker-build/Dockerfile
+++ b/debian/docker-build/Dockerfile
@@ -1,4 +1,4 @@
 FROM scratch
-LABEL maintainer "fithwum"
+LABEL maintainer="fithwum"
 ADD /debian-docker-build.tar.bz2 /
 CMD ["/bin/bash"]