From 8944c0356e7ce07c5132432d7cb14b15303ac9d6 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 23 Jun 2022 12:06:38 +0100 Subject: [PATCH 1/4] Bumping version to 2.2.4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6b4d157..0476155 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.3 \ No newline at end of file +2.2.4 \ No newline at end of file From 3563910ce611402ae198f63638de5c24fbec35f6 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 23 Jun 2022 12:06:48 +0100 Subject: [PATCH 2/4] Using latest base images --- 12/Dockerfile | 2 +- 13/Dockerfile | 2 +- 14/Dockerfile | 2 +- generate-dockerfiles.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/12/Dockerfile b/12/Dockerfile index 5abee18..ad482ed 100644 --- a/12/Dockerfile +++ b/12/Dockerfile @@ -1,4 +1,4 @@ -FROM bfren/alpine-s6:alpine3.16-4.3.2 +FROM bfren/alpine-s6:alpine3.16-4.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/13/Dockerfile b/13/Dockerfile index 1dc0950..edb0f0c 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -1,4 +1,4 @@ -FROM bfren/alpine-s6:alpine3.16-4.3.2 +FROM bfren/alpine-s6:alpine3.16-4.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/14/Dockerfile b/14/Dockerfile index be6e7f9..25b3f36 100644 --- a/14/Dockerfile +++ b/14/Dockerfile @@ -1,4 +1,4 @@ -FROM bfren/alpine-s6:alpine3.16-4.3.2 +FROM bfren/alpine-s6:alpine3.16-4.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 07ea123..4217595 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_REVISION="4.3.2" +BASE_REVISION="4.3.3" echo "Base: ${BASE_REVISION}" POSTGRESQL_VERSIONS="12 13 14" From b9a0b7c13c701750caf11088633f38d96ee61bad Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 23 Jun 2022 12:06:52 +0100 Subject: [PATCH 3/4] Updating workflow versions --- .github/workflows/dev-12.yml | 10 +++++----- .github/workflows/dev-13.yml | 10 +++++----- .github/workflows/dev-14.yml | 10 +++++----- .github/workflows/publish-12.yml | 10 +++++----- .github/workflows/publish-13.yml | 10 +++++----- .github/workflows/publish-14.yml | 10 +++++----- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/dev-12.yml b/.github/workflows/dev-12.yml index 64bc5f7..39b57a4 100644 --- a/.github/workflows/dev-12.yml +++ b/.github/workflows/dev-12.yml @@ -31,19 +31,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -51,7 +51,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . file: ./12/Dockerfile diff --git a/.github/workflows/dev-13.yml b/.github/workflows/dev-13.yml index a0a8578..acca565 100644 --- a/.github/workflows/dev-13.yml +++ b/.github/workflows/dev-13.yml @@ -31,19 +31,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -51,7 +51,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . file: ./13/Dockerfile diff --git a/.github/workflows/dev-14.yml b/.github/workflows/dev-14.yml index 7ef8fac..69cad83 100644 --- a/.github/workflows/dev-14.yml +++ b/.github/workflows/dev-14.yml @@ -31,19 +31,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -51,7 +51,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . file: ./14/Dockerfile diff --git a/.github/workflows/publish-12.yml b/.github/workflows/publish-12.yml index c70d18f..eb3424f 100644 --- a/.github/workflows/publish-12.yml +++ b/.github/workflows/publish-12.yml @@ -42,19 +42,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -62,7 +62,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . file: ./12/Dockerfile diff --git a/.github/workflows/publish-13.yml b/.github/workflows/publish-13.yml index 1019410..83af96b 100644 --- a/.github/workflows/publish-13.yml +++ b/.github/workflows/publish-13.yml @@ -42,19 +42,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -62,7 +62,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . file: ./13/Dockerfile diff --git a/.github/workflows/publish-14.yml b/.github/workflows/publish-14.yml index 91b9603..a87c8fd 100644 --- a/.github/workflows/publish-14.yml +++ b/.github/workflows/publish-14.yml @@ -42,19 +42,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -62,7 +62,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . file: ./14/Dockerfile From 3c429700c614cd14866ce11d4b6841ec9558f8a1 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 23 Jun 2022 12:15:57 +0100 Subject: [PATCH 4/4] Updating to PostgreSQL 14.4 --- 14/overlay/tmp/POSTGRESQL_BUILD | 2 +- 14/overlay/tmp/POSTGRESQL_MINOR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/14/overlay/tmp/POSTGRESQL_BUILD b/14/overlay/tmp/POSTGRESQL_BUILD index 0493ede..3a23718 100644 --- a/14/overlay/tmp/POSTGRESQL_BUILD +++ b/14/overlay/tmp/POSTGRESQL_BUILD @@ -1 +1 @@ -14.3-r0 \ No newline at end of file +14.4-r0 \ No newline at end of file diff --git a/14/overlay/tmp/POSTGRESQL_MINOR b/14/overlay/tmp/POSTGRESQL_MINOR index c519231..4493f90 100644 --- a/14/overlay/tmp/POSTGRESQL_MINOR +++ b/14/overlay/tmp/POSTGRESQL_MINOR @@ -1 +1 @@ -14.3 \ No newline at end of file +14.4 \ No newline at end of file