From 6353b66d2af59aeee58f48eabf7763cfa68505d5 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 12 Jul 2022 19:47:30 +0200 Subject: [PATCH 01/10] use newer base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 78173db..b35eab2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM thallian/confd-env:latest +FROM docker.io/thallian/confd-env:3.16 ENV PGDATA=/var/lib/postgresql/data From 9faa1a98723e08c64d0854ee22e39b969dd397bb Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 07:12:02 +0000 Subject: [PATCH 02/10] Delete '.gitlab-ci.yml' --- .gitlab-ci.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index dfb18cc..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,18 +0,0 @@ -variables: - CONTAINER_NAME: thallian/postgres - -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" From 9a1eca160ec4841e1cda8fe32cc971e18a25b78a Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 07:12:36 +0000 Subject: [PATCH 03/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..531fb2b --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,11 @@ +pipeline: + publish-docker-image: + image: plugins/kaniko + settings: + repo: docker.io/thallian/postgres + 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 c99d176e390e77a17c0a298b7b01fe7c53193150 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 22 Nov 2022 16:19:29 +0100 Subject: [PATCH 04/10] use md5 for ipv6 --- rootfs/etc/confd/templates/pg_hba.conf.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootfs/etc/confd/templates/pg_hba.conf.tmpl b/rootfs/etc/confd/templates/pg_hba.conf.tmpl index 279bd74..cdf03b7 100644 --- a/rootfs/etc/confd/templates/pg_hba.conf.tmpl +++ b/rootfs/etc/confd/templates/pg_hba.conf.tmpl @@ -1,3 +1,3 @@ local all all trust -host all all 0.0.0.0/0 md5 -host all all ::1/128 trust +host all all 0.0.0.0/0 md5 +host all all ::1/128 md5 From 4498e0e7158fc5b96ec2578b469867d9508cee52 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 22 Nov 2022 16:26:37 +0100 Subject: [PATCH 05/10] use md5 for ipv6 --- rootfs/etc/confd/templates/pg_hba.conf.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/confd/templates/pg_hba.conf.tmpl b/rootfs/etc/confd/templates/pg_hba.conf.tmpl index cdf03b7..b071c1f 100644 --- a/rootfs/etc/confd/templates/pg_hba.conf.tmpl +++ b/rootfs/etc/confd/templates/pg_hba.conf.tmpl @@ -1,3 +1,3 @@ local all all trust host all all 0.0.0.0/0 md5 -host all all ::1/128 md5 +host all all ::/128 md5 From 1130f93b4baa81868213b74efba2888a56e3af44 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Nov 2022 17:41:09 +0100 Subject: [PATCH 06/10] listen on ipv6 as well --- rootfs/etc/confd/templates/pg_hba.conf.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/confd/templates/pg_hba.conf.tmpl b/rootfs/etc/confd/templates/pg_hba.conf.tmpl index b071c1f..bc3dce7 100644 --- a/rootfs/etc/confd/templates/pg_hba.conf.tmpl +++ b/rootfs/etc/confd/templates/pg_hba.conf.tmpl @@ -1,3 +1,3 @@ local all all trust host all all 0.0.0.0/0 md5 -host all all ::/128 md5 +host all all ::0/0 md5 From 38ee066b93677c925ddce03cfde7fb81d2855b14 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Nov 2022 17:42:39 +0100 Subject: [PATCH 07/10] push to alpine 3.17 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b35eab2..24dc718 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/thallian/confd-env:3.16 +FROM docker.io/thallian/confd-env:3.17 ENV PGDATA=/var/lib/postgresql/data From 608134bef2395cb346c170774bbe2029858505d3 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 26 Sep 2023 17:34:53 +0200 Subject: [PATCH 08/10] use newer alpine --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 24dc718..f71e054 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/thallian/confd-env:3.17 +FROM docker.io/thallian/confd-env:3.18-3.1.5.0 ENV PGDATA=/var/lib/postgresql/data From c81d3cd7b9cbdc51318726f5075965cb76dc3905 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 28 Mar 2024 14:54:29 +0100 Subject: [PATCH 09/10] push to 16 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f71e054..7f315c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM docker.io/thallian/confd-env:3.18-3.1.5.0 +FROM docker.io/thallian/confd-env:3.19-3.1.6.2 ENV PGDATA=/var/lib/postgresql/data RUN apk add --no-cache \ - postgresql14 \ - postgresql14-contrib + postgresql16 \ + postgresql16-contrib RUN mkdir -p /run/postgresql && mkdir -p $PGDATA RUN chown -R postgres /run/postgresql && chown -R postgres $PGDATA From 6a325f49512177fc339b8651772426260d88a5e4 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 28 Mar 2024 14:55:40 +0100 Subject: [PATCH 10/10] use gitea ci --- .gitea/workflows/container.yaml | 12 ++++++++++++ .gitignore | 0 .woodpecker.yml | 11 ----------- Dockerfile => Containerfile | 0 4 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 .gitea/workflows/container.yaml mode change 100755 => 100644 .gitignore delete mode 100644 .woodpecker.yml rename Dockerfile => Containerfile (100%) 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/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index 531fb2b..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,11 +0,0 @@ -pipeline: - publish-docker-image: - image: plugins/kaniko - settings: - repo: docker.io/thallian/postgres - 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 100% rename from Dockerfile rename to Containerfile