From 0552eca8268951e25b7af23ef96a39987e69c1b8 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 06:38:16 +0000 Subject: [PATCH 01/10] Add '.woodpecker.yml' --- .woodpecker.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .woodpecker.yml diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..9030068 --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,11 @@ +pipeline: + publish-docker-image: + image: plugins/kaniko + settings: + repo: docker.io/thallian/confd-env + tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre} + dockerfile: Dockerfile + username: + from_secret: DOCKER_USER + password: + from_secret: DOCKER_PW \ No newline at end of file From a03b906a3ef2278081f2502003f2857a828990d2 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 06:44:37 +0000 Subject: [PATCH 02/10] Delete '.gitlab-ci.yml' --- .gitlab-ci.yml | 59 -------------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 4d5994d..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,59 +0,0 @@ -variables: - CONTAINER_NAME: thallian/confd-env - -build: - stage: build - image: - name: gcr.io/kaniko-project/executor:debug - entrypoint: [""] - script: - - mkdir -p /kaniko/.docker - - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json - - >- - /kaniko/executor - --context "$CI_PROJECT_DIR" - --dockerfile "$CI_PROJECT_DIR/Dockerfile" - --destination "$CONTAINER_NAME:$CI_COMMIT_SHA" - --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME" - --destination "$CONTAINER_NAME:latest" - -downstream-php8-fpm: - stage: .post - trigger: containers/php8-fpm -downstream-php7-fpm: - stage: .post - trigger: containers/php7-fpm -downstream-postgres: - stage: .post - trigger: containers/postgres -downstream-murmur: - stage: .post - trigger: containers/murmur -downstream-molly-brown: - stage: .post - trigger: containers/molly-brown -downstream-user-access: - stage: .post - trigger: containers/user-access -downstream-koreader-sync: - stage: .post - trigger: containers/koreader-sync -downstream-wikijs: - stage: .post - trigger: containers/wikijs -downstream-minecraft: - stage: .post - trigger: containers/minecraft -downstream-matrix-synapse: - stage: .post - trigger: containers/matrix-synapse -downstream-dovecot: - stage: .post - trigger: containers/dovecot -downstream-rspamd: - stage: .post - trigger: containers/rspamd -downstream-postfix: - stage: .post - trigger: containers/postfix - From b2c071960abda0622abe81fd1d526d3d2a8da1cb Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Nov 2022 13:30:07 +0100 Subject: [PATCH 03/10] push to alpine 3.17 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3550526..443707c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ WORKDIR $GOPATH/src/github.com/kelseyhightower/confd RUN git checkout v0.16.0 RUN make -FROM docker.io/thallian/alpine-s6:3.16 +FROM docker.io/thallian/alpine-s6:3.17 COPY --from=builder /go/src/github.com/kelseyhightower/confd/bin/confd /bin/confd From e6ad97816982f8b84effe16f04eaff7573dd9b4d Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 16 Feb 2023 21:05:30 +0100 Subject: [PATCH 04/10] use base image 3-17-3.1.3.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 443707c..93f5594 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ WORKDIR $GOPATH/src/github.com/kelseyhightower/confd RUN git checkout v0.16.0 RUN make -FROM docker.io/thallian/alpine-s6:3.17 +FROM docker.io/thallian/alpine-s6:3.17-3.1.3.0 COPY --from=builder /go/src/github.com/kelseyhightower/confd/bin/confd /bin/confd From 6170fbca8feabcfcfb9a97a800d8ec65e08afa10 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 30 May 2023 10:05:36 +0200 Subject: [PATCH 05/10] push to alpine 3.18 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 93f5594..69d6aea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ WORKDIR $GOPATH/src/github.com/kelseyhightower/confd RUN git checkout v0.16.0 RUN make -FROM docker.io/thallian/alpine-s6:3.17-3.1.3.0 +FROM docker.io/thallian/alpine-s6:3.18-3.1.5.0 COPY --from=builder /go/src/github.com/kelseyhightower/confd/bin/confd /bin/confd From e204c8b155a02384bb1edf8adaee85967c708f07 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 14 Dec 2023 10:03:55 +0100 Subject: [PATCH 06/10] move to gitea actions --- .gitea/workflows/container.yaml | 12 ++++++++++++ .woodpecker.yml | 11 ----------- Dockerfile => Containerfile | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 .gitea/workflows/container.yaml delete mode 100644 .woodpecker.yml rename Dockerfile => Containerfile (90%) diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml new file mode 100644 index 0000000..e48b3fd --- /dev/null +++ b/.gitea/workflows/container.yaml @@ -0,0 +1,12 @@ +name: Build Multiarch Container Image +on: [push] +jobs: + call-reusable-workflow: + uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main + with: + repository: ${{ gitea.repository }} + ref_name: ${{ gitea.ref_name }} + sha: ${{ gitea.sha }} + registry_url: ${{ secrets.REGISTRY_URL }} + registry_user: ${{ secrets.REGISTRY_USER }} + registry_pw: ${{ secrets.REGISTRY_PW }} diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index 9030068..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,11 +0,0 @@ -pipeline: - publish-docker-image: - image: plugins/kaniko - settings: - repo: docker.io/thallian/confd-env - tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre} - dockerfile: Dockerfile - username: - from_secret: DOCKER_USER - password: - from_secret: DOCKER_PW \ No newline at end of file diff --git a/Dockerfile b/Containerfile similarity index 90% rename from Dockerfile rename to Containerfile index 69d6aea..c7131f3 100644 --- a/Dockerfile +++ b/Containerfile @@ -11,7 +11,7 @@ WORKDIR $GOPATH/src/github.com/kelseyhightower/confd RUN git checkout v0.16.0 RUN make -FROM docker.io/thallian/alpine-s6:3.18-3.1.5.0 +FROM docker.io/thallian/alpine-s6:3.19-3.1.6.2 COPY --from=builder /go/src/github.com/kelseyhightower/confd/bin/confd /bin/confd From c3517b949c8d2e6d00d2c88738c58c25a64737fd Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 14 Dec 2023 10:07:36 +0100 Subject: [PATCH 07/10] use workflow defaults --- .gitea/workflows/container.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml index e48b3fd..5ad3480 100644 --- a/.gitea/workflows/container.yaml +++ b/.gitea/workflows/container.yaml @@ -3,10 +3,3 @@ on: [push] jobs: call-reusable-workflow: uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main - with: - repository: ${{ gitea.repository }} - ref_name: ${{ gitea.ref_name }} - sha: ${{ gitea.sha }} - registry_url: ${{ secrets.REGISTRY_URL }} - registry_user: ${{ secrets.REGISTRY_USER }} - registry_pw: ${{ secrets.REGISTRY_PW }} From 3b8e2bbb65ef4f027eb65a2897db6076e8582ba0 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 14 Dec 2023 10:12:55 +0100 Subject: [PATCH 08/10] no defaults for us --- .gitea/workflows/container.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml index 5ad3480..d5aa89c 100644 --- a/.gitea/workflows/container.yaml +++ b/.gitea/workflows/container.yaml @@ -3,3 +3,11 @@ on: [push] jobs: call-reusable-workflow: uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main + with: + repository: ${{ gitea.repository }} + ref_name: ${{ gitea.ref_name }} + sha: ${{ gitea.sha }} + registry_url: ${{ secrets.REGISTRY_URL }} + registry_user: ${{ secrets.REGISTRY_USER }} + secrets: + registry_pw: ${{ secrets.REGISTRY_PW }} From aa6be60bc8f897b2374a291987d3a2940da775a5 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 14 Dec 2023 10:24:15 +0100 Subject: [PATCH 09/10] use dev version --- Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index c7131f3..3fc4021 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/golang:1.13.14-alpine AS builder +FROM docker.io/golang:1.21-alpine3.19 AS builder RUN apk --no-cache add \ git \ @@ -8,7 +8,7 @@ RUN mkdir -p $GOPATH/src/github.com/kelseyhightower RUN git clone https://github.com/kelseyhightower/confd.git $GOPATH/src/github.com/kelseyhightower/confd WORKDIR $GOPATH/src/github.com/kelseyhightower/confd -RUN git checkout v0.16.0 +RUN git checkout 919444eb6cf721d198b2bb18581d0f0b3734d107 RUN make FROM docker.io/thallian/alpine-s6:3.19-3.1.6.2 From f919a15068c5d78bd393b7c31936e17fa06d3300 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 14 Dec 2023 10:39:17 +0100 Subject: [PATCH 10/10] try this variant --- .gitea/workflows/container.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml index d5aa89c..e48b3fd 100644 --- a/.gitea/workflows/container.yaml +++ b/.gitea/workflows/container.yaml @@ -9,5 +9,4 @@ jobs: sha: ${{ gitea.sha }} registry_url: ${{ secrets.REGISTRY_URL }} registry_user: ${{ secrets.REGISTRY_USER }} - secrets: registry_pw: ${{ secrets.REGISTRY_PW }}