dhi helper

remove debian

Author: Tob1as

.github/workflows/build_docker-dhi_helper.yml

@@ -135,72 +135,3 @@ jobs:
             quay.io/${{env.QUAY_REPO}}:dhi-helper-alpine-${{env.COMMIT_HASH}}
           #  ${{env.GIT_URL}}/${{env.GIT_REPO}}:dhi-helper-alpine
           #  ${{env.GIT_URL}}/${{env.GIT_REPO}}:dhi-helper-alpine-${{env.COMMIT_HASH}}
-
-
-  # --------------------------------------------------
-  # JOB: DHI Debian Helper
-  # --------------------------------------------------
-  build-dhi-helper-debian:
-    name: Build DHI Helper (Debian)
-    runs-on: ubuntu-latest
-    needs: prepare
-
-    env:
-      BUILD_DATE: ${{ needs.prepare.outputs.build_date }}
-      BUILD_DATE_NUMERIC: ${{ needs.prepare.outputs.build_date_numeric}}
-      COMMIT_HASH: ${{ needs.prepare.outputs.commit_hash }}
-      GIT_URL: ${{ needs.prepare.outputs.git_url }}
-      GIT_REPO: ${{ needs.prepare.outputs.git_repo }}
-      GIT_REPO_SHORT: ${{ needs.prepare.outputs.git_repo_short }}
-      DOCKER_REPO: ${{ needs.prepare.outputs.docker_repo }}
-      QUAY_REPO: ${{ needs.prepare.outputs.quay_repo }}
-      PHP_VERSION: ${{ matrix.php }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Debug Variables
-        run: |
-          echo "BUILD_DATE=${BUILD_DATE}"
-          echo "BUILD_DATE_NUMERIC=${BUILD_DATE_NUMERIC}"
-          echo "COMMIT_HASH=${COMMIT_HASH}"
-          echo "GIT_URL=${GIT_URL}"
-          echo "GIT_REPO=${GIT_REPO}"
-          echo "GIT_REPO_SHORT=${GIT_REPO_SHORT}"
-          echo "DOCKER_REPO=${DOCKER_REPO}"
-          echo "QUAY_REPO=${QUAY_REPO}"
-
-      - name: Execute Docker Setup
-        id: docker-setup
-        uses: ./.github/actions/docker-setup
-        #uses: tob1as/docker-build-example/.github/actions/docker-setup@main
-        with:
-          git_url: ${{ env.GIT_URL }}
-          git_username: ${{ github.repository_owner }}
-          git_token: ${{ secrets.GITHUB_TOKEN }}
-          docker_username: ${{ vars.DOCKER_USERNAME }}
-          docker_password: ${{ secrets.DOCKER_PASSWORD }}
-          quay_username: ${{ vars.REDHAT_QUAY_USERNAME }}
-          quay_password: ${{ secrets.REDHAT_QUAY_PASSWORD }}
-
-      - name: Build
-        uses: docker/build-push-action@v6
-        with:
-          builder: ${{ steps.docker-setup.outputs.builder_name }}
-          context: .
-          file: ./dhi.helper.Dockerfile
-          platforms: linux/amd64,linux/arm64
-          pull: true
-          push: true
-          target: production-debian
-          build-args: |
-            BUILD_DATE=${{ env.BUILD_DATE }}
-            VCS_REF=${{ env.COMMIT_HASH }}
-          tags: |
-            docker.io/${{env.DOCKER_REPO}}:dhi-helper-debian
-            docker.io/${{env.DOCKER_REPO}}:dhi-helper-debian-${{env.COMMIT_HASH}}
-            quay.io/${{env.QUAY_REPO}}:dhi-helper-debian
-            quay.io/${{env.QUAY_REPO}}:dhi-helper-debian-${{env.COMMIT_HASH}}
-          #  ${{env.GIT_URL}}/${{env.GIT_REPO}}:dhi-helper-debian
-          #  ${{env.GIT_URL}}/${{env.GIT_REPO}}:dhi-helper-debian-${{env.COMMIT_HASH}}

dhi.helper.Dockerfile

@@ -1,7 +1,6 @@
 # build: docker build --no-cache --progress=plain --target=production-alpine -t docker.io/tobi312/php:dhi-helper-alpine -f dhi.helper.Dockerfile .
-ARG ALPINE_OS_VERSION=3.23
-ARG DEBIAN_OS_VERSION=trixie
-FROM dhi.io/alpine-base:${ALPINE_OS_VERSION}-dev AS dev-alpine
+ARG BUILD_OS=3.23
+FROM dhi.io/alpine-base:${BUILD_OS}-dev AS dev-alpine
 
 SHELL ["/bin/sh", "-o", "pipefail", "-c"]
 
@@ -59,7 +58,7 @@ COPY --from=dev-alpine /usr/local/bin/wsc-setup-preparation.sh /apkroot/usr/loca
 RUN tree /apkroot
 
 
-FROM dhi.io/alpine-base:${ALPINE_OS_VERSION} AS production-alpine
+FROM dhi.io/alpine-base:${BUILD_OS} AS production-alpine
 ARG BUILD_PHP_VERSION
 ARG VCS_REF
 ARG BUILD_DATE
@@ -76,44 +75,4 @@ LABEL org.opencontainers.image.authors="Tobias Hargesheimer <docker@ison.ws>" \
 COPY --from=builder-alpine /apkroot /
 WORKDIR /tmp
 #USER nonroot
-CMD [ "tail", "-f", "/dev/null" ]
-
-
-FROM dhi.io/debian-base:${DEBIAN_OS_VERSION} AS production-debian
-ARG BUILD_PHP_VERSION
-ARG VCS_REF
-ARG BUILD_DATE
-#ENV TERM=xterm
-LABEL org.opencontainers.image.authors="Tobias Hargesheimer <docker@ison.ws>" \
-      org.opencontainers.image.title="Helper tools (dhi debian)" \
-      org.opencontainers.image.description="DHI (Docker Hardened Images): Helper tools on Debian" \
-      org.opencontainers.image.created="${BUILD_DATE}" \
-      org.opencontainers.image.revision="${VCS_REF}" \
-      org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.url="https://hub.docker.com/r/tobi312/php" \
-      org.opencontainers.image.source="https://github.com/Tob1as/docker-php"
-
-#USER root
-
-RUN apt-get update && \
-    apt-get install -y \
-        libfcgi-bin \
-        unzip \
-        curl \
-        wget \
-        netcat-openbsd \
-        nano \
-        mariadb-client \
-        jq \
-        #yq \
-        kubectl \
-        sshpass openssh-client \
-    && \
-    rm -rf /var/lib/apt/lists/*
-
-COPY --from=dev-alpine /usr/local/bin/php-fpm-healthcheck.sh /usr/local/bin/php-fpm-healthcheck.sh
-COPY --from=dev-alpine /usr/local/bin/wsc-setup-preparation.sh /usr/local/bin/wsc-setup-preparation.sh
-
-WORKDIR /tmp
-USER nonroot
-CMD [ "tail", "-f", "/dev/null" ]
+CMD [ "tail", "-f", "/dev/null" ]