From 722e67d8a4964ae8e73da7840df1aa44b6c8277b Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 21 Jan 2025 11:57:46 +0100 Subject: [PATCH 01/14] import from original repo Signed-off-by: Pablo --- .github/workflows/docker.yaml | 81 +++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 .github/workflows/docker.yaml diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml new file mode 100644 index 000000000..29c16e130 --- /dev/null +++ b/.github/workflows/docker.yaml @@ -0,0 +1,81 @@ +name: Docker + +on: + push: + branches: + - master + tags: + - "[0-9]+.[0-9]+.[0-9]+" + - "[0-9]+.[0-9]+.[0-9]+-dev.[0-9]+" + pull_request: + +jobs: + docker: + name: Docker + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + # Required for correctly populating ldflags + fetch-depth: 0 + + - name: Calculate Docker image tags + id: tags + env: + DOCKER_IMAGES: "ghcr.io/${{ github.repository }}" + run: | + case $GITHUB_REF in + refs/tags/*) VERSION=${GITHUB_REF#refs/tags/};; + refs/heads/*) VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g');; + refs/pull/*) VERSION=pr-${{ github.event.number }};; + *) VERSION=sha-${GITHUB_SHA::8};; + esac + + TAGS=() + for image in $DOCKER_IMAGES; do + TAGS+=("${image}:${VERSION}") + + if [[ "${{ github.event.repository.default_branch }}" == "$VERSION" ]]; then + TAGS+=("${image}:latest") + fi + done + + echo "version=${VERSION}" >> $GITHUB_OUTPUT + IFS=, ; echo "tags=${TAGS[*]}" >> $GITHUB_OUTPUT + echo "commit_hash=${GITHUB_SHA::8}" >> $GITHUB_OUTPUT + echo "build_date=$(git show -s --format=%cI)" >> $GITHUB_OUTPUT + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ github.token }} + if: github.event_name == 'push' + + - name: Build and push + uses: docker/build-push-action@v2 + with: + push: ${{ github.event_name == 'push' }} + tags: ${{ steps.tags.outputs.tags }} + context: . + build-args: | + VERSION=${{ steps.tags.outputs.version }} + COMMIT_HASH=${{ steps.tags.outputs.commit_hash }} + BUILD_DATE=${{ steps.tags.outputs.build_date }} + labels: | + org.opencontainers.image.title=${{ github.event.repository.name }} + org.opencontainers.image.description=${{ github.event.repository.description }} + org.opencontainers.image.url=${{ github.event.repository.html_url }} + org.opencontainers.image.source=${{ github.event.repository.clone_url }} + org.opencontainers.image.version=${{ steps.tags.outputs.version }} + org.opencontainers.image.created=${{ steps.tags.outputs.build_date }} + org.opencontainers.image.revision=${{ github.sha }} + org.opencontainers.image.licenses=${{ github.event.repository.license.spdx_id }} + org.opencontainers.image.vendor=Banzai Cloud + org.opencontainers.image.documentation=https://banzaicloud.com/docs/pipeline/overview/ From c4f763fbd0950fd113e41d3d0122557257e03e84 Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 21 Jan 2025 12:02:21 +0100 Subject: [PATCH 02/14] fix set-output Signed-off-by: Pablo --- .github/workflows/docker.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 29c16e130..3b80046cb 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -42,10 +42,10 @@ jobs: fi done - echo "version=${VERSION}" >> $GITHUB_OUTPUT - IFS=, ; echo "tags=${TAGS[*]}" >> $GITHUB_OUTPUT - echo "commit_hash=${GITHUB_SHA::8}" >> $GITHUB_OUTPUT - echo "build_date=$(git show -s --format=%cI)" >> $GITHUB_OUTPUT + echo ::set-output name=version::${VERSION} + echo ::set-output name=tags::$(IFS=,; echo "${TAGS[*]}") + echo ::set-output name=commit_hash::${GITHUB_SHA::8} + echo ::set-output name=build_date::$(git show -s --format=%cI) - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 From 45d7a071204d8471d012a0921679c4700e67e0ee Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 21 Jan 2025 12:09:04 +0100 Subject: [PATCH 03/14] udpate base image Signed-off-by: Pablo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8f769a599..fac606187 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build image -FROM golang:1.16-alpine3.13 AS builder +FROM golang:1.23-alpine3.21 AS builder ENV GOFLAGS="-mod=readonly" From 66f87e519123be33c0be5e41bdeb77c22c5ee95a Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 21 Jan 2025 12:21:57 +0100 Subject: [PATCH 04/14] update registry authentication Signed-off-by: Pablo --- .github/workflows/docker.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 3b80046cb..e0d0a93c1 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -24,7 +24,7 @@ jobs: - name: Calculate Docker image tags id: tags env: - DOCKER_IMAGES: "ghcr.io/${{ github.repository }}" + DOCKER_IMAGES: "cr.seqera.io/public/${{ github.repository }}" run: | case $GITHUB_REF in refs/tags/*) VERSION=${GITHUB_REF#refs/tags/};; @@ -53,9 +53,9 @@ jobs: - name: Login to GitHub Container Registry uses: docker/login-action@v1 with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ github.token }} + registry: cr.seqera.io + username: ${{ github.SEQERA_CR_USERNAME }} + password: ${{ secrets.SEQERA_PUBLIC_CR_PASSWORD }} if: github.event_name == 'push' - name: Build and push From 469d910e1349d5e5bf552890e5399098cc83a74e Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 21 Jan 2025 12:25:03 +0100 Subject: [PATCH 05/14] update Signed-off-by: Pablo --- .github/workflows/docker.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index e0d0a93c1..f1369a01f 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -54,9 +54,8 @@ jobs: uses: docker/login-action@v1 with: registry: cr.seqera.io - username: ${{ github.SEQERA_CR_USERNAME }} + username: ${{ secrets.SEQERA_CR_USERNAME }} password: ${{ secrets.SEQERA_PUBLIC_CR_PASSWORD }} - if: github.event_name == 'push' - name: Build and push uses: docker/build-push-action@v2 From 4d2334c702d63b459973e886c76c61906d3c013e Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 21 Jan 2025 12:53:52 +0100 Subject: [PATCH 06/14] update login-action Signed-off-by: Pablo --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index f1369a01f..aa78a90fc 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -51,7 +51,7 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3.3.0 with: registry: cr.seqera.io username: ${{ secrets.SEQERA_CR_USERNAME }} From c71422f36aeed174012d92525bd0e48fd5d3fb73 Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 21 Jan 2025 12:55:09 +0100 Subject: [PATCH 07/14] update login-action Signed-off-by: Pablo --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index aa78a90fc..67976e184 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -51,7 +51,7 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Login to GitHub Container Registry - uses: docker/login-action@v3.3.0 + uses: docker/login-action@v3 with: registry: cr.seqera.io username: ${{ secrets.SEQERA_CR_USERNAME }} From a0c15746bea25d616ebeb3248eceaad0037120f1 Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 21 Jan 2025 12:58:36 +0100 Subject: [PATCH 08/14] try seqera_cr_password Signed-off-by: Pablo --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 67976e184..9297379b0 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -55,7 +55,7 @@ jobs: with: registry: cr.seqera.io username: ${{ secrets.SEQERA_CR_USERNAME }} - password: ${{ secrets.SEQERA_PUBLIC_CR_PASSWORD }} + password: ${{ secrets.SEQERA_CR_PASSWORD }} - name: Build and push uses: docker/build-push-action@v2 From d9ff0a8b017b95d3b117094c9c46d1bee0c2bc4c Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 21 Jan 2025 14:13:56 +0100 Subject: [PATCH 09/14] update build-push action Signed-off-by: Pablo --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 9297379b0..40c3b53ec 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -58,7 +58,7 @@ jobs: password: ${{ secrets.SEQERA_CR_PASSWORD }} - name: Build and push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: push: ${{ github.event_name == 'push' }} tags: ${{ steps.tags.outputs.tags }} From 2b10480475779ca572035684bd845142ff177ffb Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 21 Jan 2025 14:17:50 +0100 Subject: [PATCH 10/14] enable push Signed-off-by: Pablo --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 40c3b53ec..8469409d5 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -60,7 +60,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v6 with: - push: ${{ github.event_name == 'push' }} + push: true tags: ${{ steps.tags.outputs.tags }} context: . build-args: | From baf22c0008e256a960898c115fa7d04d728b9a76 Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 21 Jan 2025 14:25:19 +0100 Subject: [PATCH 11/14] update alpine image Signed-off-by: Pablo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fac606187..2d7f87398 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe && \ # Final image -FROM alpine:3.14.0 +FROM alpine:3.21.2 RUN apk add --update --no-cache ca-certificates tzdata bash curl From 69470b2af23bca7ad031f944aced53bc9570a0ca Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 21 Jan 2025 14:32:55 +0100 Subject: [PATCH 12/14] fixes dockerfile Signed-off-by: Pablo --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2d7f87398..3ea0ab2c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,8 @@ SHELL ["/bin/bash", "-c"] # set up nsswitch.conf for Go's "netgo" implementation # https://github.com/gliderlabs/docker-alpine/issues/367#issuecomment-424546457 -RUN test ! -e /etc/nsswitch.conf && echo 'hosts: files dns' > /etc/nsswitch.conf +RUN echo 'hosts: files dns' > /etc/nsswitch.conf +#RUN test ! -e /etc/nsswitch.conf && echo 'hosts: files dns' > /etc/nsswitch.conf ARG BUILD_TARGET @@ -51,6 +52,6 @@ COPY configs /etc/cloudinfo/serviceconfig RUN sed -i "s|dataLocation: ./configs/|dataLocation: /etc/cloudinfo/serviceconfig/|g" /etc/cloudinfo/serviceconfig/services.yaml -ENV CLOUDINFO_SERVICELOADER_SERVICECONFIGLOCATION "/etc/cloudinfo/serviceconfig" +ENV CLOUDINFO_SERVICELOADER_SERVICECONFIGLOCATION="/etc/cloudinfo/serviceconfig" CMD ["cloudinfo"] From 987a30845e11ddb592e705ce5ac91b5bbae26d38 Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 21 Jan 2025 14:34:00 +0100 Subject: [PATCH 13/14] update base image Signed-off-by: Pablo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3ea0ab2c9..c7c3e4abf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe && \ # Final image -FROM alpine:3.21.2 +FROM alpine:edge RUN apk add --update --no-cache ca-certificates tzdata bash curl From 368cab5f0ea75680e6d428e5dd82939a260e5cea Mon Sep 17 00:00:00 2001 From: Pablo Date: Fri, 24 Jan 2025 12:16:57 +0100 Subject: [PATCH 14/14] use seqera docs and vendor Signed-off-by: Pablo --- .github/workflows/docker.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 8469409d5..cbece4e12 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -76,5 +76,5 @@ jobs: org.opencontainers.image.created=${{ steps.tags.outputs.build_date }} org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.licenses=${{ github.event.repository.license.spdx_id }} - org.opencontainers.image.vendor=Banzai Cloud - org.opencontainers.image.documentation=https://banzaicloud.com/docs/pipeline/overview/ + org.opencontainers.image.vendor=Seqera Labs + org.opencontainers.image.documentation=https://seqeralabs.com/docs/pipeline/overview/