From 3711cffb1fde541d2ab9e05050ae81c30943f653 Mon Sep 17 00:00:00 2001 From: fithwum Date: Thu, 3 Jul 2025 07:22:06 -0700 Subject: [PATCH] updates --- .gitea/workflows/base-build.yml | 20 ++++---------------- .gitlab-ci.yml | 22 ---------------------- debian/bookworm/.pipeline.yml | 18 ------------------ debian/bookworm/Dockerfile | 2 +- debian/bullseye/.pipeline.yml | 18 ------------------ debian/bullseye/Dockerfile | 2 +- debian/buster/.pipeline.yml | 18 ------------------ debian/buster/Dockerfile | 2 +- debian/docker-build/.pipeline.yml | 18 ------------------ debian/docker-build/Dockerfile | 2 +- 10 files changed, 8 insertions(+), 114 deletions(-) delete mode 100644 .gitlab-ci.yml delete mode 100644 debian/bookworm/.pipeline.yml delete mode 100644 debian/bullseye/.pipeline.yml delete mode 100644 debian/buster/.pipeline.yml delete mode 100644 debian/docker-build/.pipeline.yml diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml index 1c40aea..6ae47da 100644 --- 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 \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 39344ec..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -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" \ No newline at end of file diff --git a/debian/bookworm/.pipeline.yml b/debian/bookworm/.pipeline.yml deleted file mode 100644 index 24b8968..0000000 --- a/debian/bookworm/.pipeline.yml +++ /dev/null @@ -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 diff --git a/debian/bookworm/Dockerfile b/debian/bookworm/Dockerfile index 1b7fad3..0ee201a 100644 --- 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"] \ No newline at end of file diff --git a/debian/bullseye/.pipeline.yml b/debian/bullseye/.pipeline.yml deleted file mode 100644 index b71b498..0000000 --- a/debian/bullseye/.pipeline.yml +++ /dev/null @@ -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 diff --git a/debian/bullseye/Dockerfile b/debian/bullseye/Dockerfile index 07da3cf..9e32aaa 100644 --- 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"] \ No newline at end of file diff --git a/debian/buster/.pipeline.yml b/debian/buster/.pipeline.yml deleted file mode 100644 index 209cd4a..0000000 --- a/debian/buster/.pipeline.yml +++ /dev/null @@ -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 diff --git a/debian/buster/Dockerfile b/debian/buster/Dockerfile index 8b4f7cd..4e823d8 100644 --- 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"] \ No newline at end of file diff --git a/debian/docker-build/.pipeline.yml b/debian/docker-build/.pipeline.yml deleted file mode 100644 index cc8b4f1..0000000 --- a/debian/docker-build/.pipeline.yml +++ /dev/null @@ -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 diff --git a/debian/docker-build/Dockerfile b/debian/docker-build/Dockerfile index 14172b1..ba29a50 100644 --- 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"] \ No newline at end of file