From 56c4f7a0336b2e9f8197c69dd5a75c9bf7deff4e Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Mon, 16 Dec 2024 03:36:44 +0700 Subject: [PATCH] Changed back to docker but with quay registry --- .gitea/workflows/almalinux8.yaml | 85 ++++++++++---------------------- .gitea/workflows/almalinux9.yaml | 78 +++++++++-------------------- 8/Dockerfile.micro | 2 + 3 files changed, 50 insertions(+), 115 deletions(-) diff --git a/.gitea/workflows/almalinux8.yaml b/.gitea/workflows/almalinux8.yaml index 42267ab..a2d4f17 100644 --- a/.gitea/workflows/almalinux8.yaml +++ b/.gitea/workflows/almalinux8.yaml @@ -10,19 +10,15 @@ jobs: name: Build almalinux8 container images runs-on: ubuntu-latest container: - image: quay.io/almalinuxorg/9-minimal:9.5 + image: ghcr.io/catthehacker/ubuntu:act-latest strategy: matrix: flavor: ["default", "micro"] version: ["8.10"] steps: - - name: Setup requirement - shell: bash - run: | - microdnf -y install git nodejs buildah podman - name: Check out repository code uses: actions/checkout@v4 - - name: Login to quay.io + - name: Login to docker.io uses: docker/login-action@v3 with: registry: quay.io @@ -33,16 +29,17 @@ jobs: - name: Setup Docker buildx uses: docker/setup-buildx-action@v3 - if: ${{ matrix.flavor == 'default' }} - name: Build almalinux default image - uses: redhat-actions/buildah-build@v2 + name: Build and push almalinux base + uses: docker/build-push-action@v5 with: + # platforms: linux/amd64,linux/arm64 + push: true context: . - containerfiles: | - 8/Containerfile.${{ matrix.flavor }} + file: ./8/Dockerfile.${{ matrix.flavor }} build-args: | - ALMALINUX_VERSION=${{ matrix.version }} + ALMALINUX_VERSION=${{ matrix.version }} tags: | - quay.io/sindigilive/almalinux:${{ matrix.version }} + quay.io/sindigilive/almalinux:${{ matrix.version }} - if: ${{ matrix.flavor == 'micro' }} name: Build and push almalinux flavor uses: docker/build-push-action@v5 @@ -52,9 +49,9 @@ jobs: context: . file: ./8/Dockerfile.${{ matrix.flavor }} build-args: | - ALMALINUX_VERSION=${{ matrix.version }} + ALMALINUX_VERSION=${{ matrix.version }} tags: | - quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }} + quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }} - if: ${{ matrix.flavor == 'default' }} name: Scan almalinux image with Trivy uses: aquasecurity/trivy-action@0.20.0 @@ -62,48 +59,24 @@ jobs: image-ref: 'quay.io/sindigilive/almalinux:${{ matrix.version }}' format: 'sarif' output: 'trivy-results.sarif' - - if: ${{ matrix.flavor != 'default' }} - name: Build and push almalinux flavor - uses: redhat-actions/buildah-build@v2 - with: - context: . - containerfiles: | - 8/Dockerfile.${{ matrix.flavor }} - build-args: | - ALMALINUX_VERSION=${{ matrix.version }} - tags: | - quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }} - - if: ${{ matrix.flavor != 'default' }} - name: Push almalinux flavor image to quay.io - uses: redhat-actions/push-to-registry@v2 - with: - tags: quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }} - registry: quay.io - username: ${{ vars.QUAY_USERNAME }} - password: ${{ secrets.QUAY_SECRET }} - - if: ${{ matrix.flavor != 'default' }} - name: Scan almalinux flavor image with Trivy + - if: ${{ matrix.flavor == 'micro' }} + name: Scan almalinux image with Trivy uses: aquasecurity/trivy-action@0.20.0 with: image-ref: 'quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }}' format: 'sarif' output: 'trivy-results.sarif' - build-latest: name: Build latest almalinux8 container images - runs-on: almalinux-latest + runs-on: ubuntu-latest needs: - build container: - image: quay.io/almalinuxorg/9-minimal:9.5 + image: ghcr.io/catthehacker/ubuntu:act-latest steps: - - name: Setup requirement - shell: bash - run: | - microdnf -y install git nodejs buildah podman - name: Check out repository code uses: actions/checkout@v4 - - name: Login to quay.io + - name: Login to docker.io uses: docker/login-action@v3 with: registry: quay.io @@ -113,27 +86,21 @@ jobs: # uses: docker/setup-qemu-action@v3 - name: Setup Docker buildx uses: docker/setup-buildx-action@v3 - - name: Build and push latest almalinux9-micro + - name: Build and push latest almalinux8-micro uses: docker/build-push-action@v5 with: + # platforms: linux/amd64,linux/arm64 + push: true context: . - containerfiles: | - 8/Dockerfile.micro + file: ./8/Dockerfile.micro tags: | - quay.io/sindigilive/almalinux:8-micro - - name: Build and push latest almalinux9 + quay.io/sindigilive/almalinux:8-micro + - name: Build and push latest almalinux8 uses: docker/build-push-action@v5 with: + # platforms: linux/amd64,linux/arm64 + push: true context: . - containerfiles: | - 8/Dockerfile.micro + file: ./8/Dockerfile.default tags: | - quay.io/sindigilive/almalinux:8 - - name: Push latest almalinux image to quay.io - uses: redhat-actions/push-to-registry@v2 - with: - registry: quay.io - username: ${{ vars.QUAY_USERNAME }} - password: ${{ secrets.QUAY_SECRET }} - tags: | - quay.io/sindigilive/almalinux:8 + quay.io/sindigilive/almalinux:8 diff --git a/.gitea/workflows/almalinux9.yaml b/.gitea/workflows/almalinux9.yaml index 2c7dad2..dd12727 100644 --- a/.gitea/workflows/almalinux9.yaml +++ b/.gitea/workflows/almalinux9.yaml @@ -10,16 +10,12 @@ jobs: name: Build almalinux9 container images runs-on: ubuntu-latest container: - image: quay.io/almalinuxorg/9-minimal:9.5 + image: ghcr.io/catthehacker/ubuntu:act-latest strategy: matrix: flavor: ["default", "micro"] version: ["9.5"] steps: - - name: Setup requirement - shell: bash - run: | - microdnf -y install git nodejs buildah podman - name: Check out repository code uses: actions/checkout@v4 - name: Login to docker.io @@ -36,13 +32,14 @@ jobs: name: Build and push almalinux uses: docker/build-push-action@v5 with: + # platforms: linux/amd64,linux/arm64 + push: true context: . - containerfiles: | - 9/Containerfile.${{ matrix.flavor }} + file: ./9/Dockerfile.${{ matrix.flavor }} build-args: | - ALMALINUX_VERSION=${{ matrix.version }} + ALMALINUX_VERSION=${{ matrix.version }} tags: | - quay.io/sindigilive/almalinux:${{ matrix.version }} + quay.io/sindigilive/almalinux:${{ matrix.version }} - if: ${{ matrix.flavor == 'micro' }} name: Build and push almalinux uses: docker/build-push-action@v5 @@ -52,55 +49,31 @@ jobs: context: . file: ./9/Dockerfile.${{ matrix.flavor }} build-args: | - ALMALINUX_VERSION=${{ matrix.version }} + ALMALINUX_VERSION=${{ matrix.version }} tags: | - quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }} + quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }} - if: ${{ matrix.flavor == 'default' }} - name: Scan almalinux image with Trivy + name: Scan almalinux9 image with Trivy uses: aquasecurity/trivy-action@0.20.0 with: image-ref: 'quay.io/sindigilive/almalinux:${{ matrix.version }}' format: 'sarif' output: 'trivy-results.sarif' - - if: ${{ matrix.flavor != 'default' }} - name: Build and push almalinux flavor - uses: redhat-actions/buildah-build@v2 - with: - context: . - containerfiles: | - 9/Dockerfile.${{ matrix.flavor }} - build-args: | - ALMALINUX_VERSION=${{ matrix.version }} - tags: | - quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }} - - if: ${{ matrix.flavor != 'default' }} - name: Push almalinux flavor image to quay.io - uses: redhat-actions/push-to-registry@v2 - with: - tags: quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }} - registry: quay.io - username: ${{ vars.QUAY_USERNAME }} - password: ${{ secrets.QUAY_SECRET }} - - if: ${{ matrix.flavor != 'default' }} - name: Scan almalinux flavor image with Trivy + - if: ${{ matrix.flavor == 'micro' }} + name: Scan almalinux9 image with Trivy uses: aquasecurity/trivy-action@0.20.0 with: image-ref: 'quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }}' format: 'sarif' output: 'trivy-results.sarif' - build-latest: name: Build latest almalinux9 container images - runs-on: almalinux-latest + runs-on: ubuntu-latest needs: - build container: - image: quay.io/almalinuxorg/9-minimal:9.5 + image: ghcr.io/catthehacker/ubuntu:act-latest steps: - - name: Setup requirement - shell: bash - run: | - microdnf -y install git nodejs buildah podman - name: Check out repository code uses: actions/checkout@v4 - name: Login to docker.io @@ -114,29 +87,22 @@ jobs: - name: Setup Docker buildx uses: docker/setup-buildx-action@v3 - name: Build and push latest almalinux9-micro - uses: redhat-actions/buildah-build@v2 + uses: docker/build-push-action@v5 with: + # platforms: linux/amd64,linux/arm64 + push: true context: . - containerfiles: | - 9/Dockerfile.micro + file: ./9/Dockerfile.micro tags: | quay.io/sindigilive/almalinux:9-micro - quay.io/sindigilive/almalinux:micro + quay.io/sindigilive/almalinux:micro - name: Build and push latest almalinux9 uses: docker/build-push-action@v5 with: + # platforms: linux/amd64,linux/arm64 + push: true context: . - containerfiles: | - 9/Dockerfile.micro + file: ./9/Dockerfile.default tags: | quay.io/sindigilive/almalinux:9 - quay.io/sindigilive/almalinux:latest - - name: Push latest almalinux image to quay.io - uses: redhat-actions/push-to-registry@v2 - with: - registry: quay.io - username: ${{ vars.QUAY_USERNAME }} - password: ${{ secrets.QUAY_SECRET }} - tags: | - quay.io/sindigilive/almalinux:9 - quay.io/sindigilive/almalinux:latest + quay.io/sindigilive/almalinux:latest diff --git a/8/Dockerfile.micro b/8/Dockerfile.micro index 14bbb3d..66462af 100644 --- a/8/Dockerfile.micro +++ b/8/Dockerfile.micro @@ -36,6 +36,8 @@ RUN rm -rf /mnt/rootfs/var/cache/dnf /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/li FROM scratch +ARG ALMALINUX_VERSION=8.10 + LABEL maintainer="Muhamad Aditya Prima " LABEL name="almalinux-micro" LABEL version="${ALMALINUX_VERSION}"