From d2a7cb09853cb31bf8480c2b57e4bbb01d9ba66d Mon Sep 17 00:00:00 2001 From: Ben Green Date: Thu, 17 Mar 2022 10:55:02 +0000 Subject: [PATCH 1/3] Bumping version to 2.1.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7c32728..8f9174b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.1 \ No newline at end of file +2.1.2 \ No newline at end of file From 6edf2555d8fb2d2fc45109d4616b3077a86babaa Mon Sep 17 00:00:00 2001 From: Ben Green Date: Thu, 17 Mar 2022 10:55:05 +0000 Subject: [PATCH 2/3] 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 33594a9..3046d94 100644 --- a/12/Dockerfile +++ b/12/Dockerfile @@ -1,4 +1,4 @@ -FROM bfren/alpine-s6:alpine3.15-4.2.0 +FROM bfren/alpine-s6:alpine3.15-4.2.1 ARG BF_IMAGE ARG BF_VERSION diff --git a/13/Dockerfile b/13/Dockerfile index 4771175..2a1c50e 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -1,4 +1,4 @@ -FROM bfren/alpine-s6:alpine3.15-4.2.0 +FROM bfren/alpine-s6:alpine3.15-4.2.1 ARG BF_IMAGE ARG BF_VERSION diff --git a/14/Dockerfile b/14/Dockerfile index ffa5ed0..fe222a3 100644 --- a/14/Dockerfile +++ b/14/Dockerfile @@ -1,4 +1,4 @@ -FROM bfren/alpine-s6:alpine3.15-4.2.0 +FROM bfren/alpine-s6:alpine3.15-4.2.1 ARG BF_IMAGE ARG BF_VERSION diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index d5dad44..2f69d4a 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_REVISION="4.2.0" +BASE_REVISION="4.2.1" echo "Base: ${BASE_REVISION}" POSTGRESQL_VERSIONS="12 13 14" From 24acde5552a3f6750af63d4a25b4a20e53c54b2b Mon Sep 17 00:00:00 2001 From: Ben Green Date: Thu, 17 Mar 2022 10:55:40 +0000 Subject: [PATCH 3/3] Moving version files to individual overlay/tmp --- .github/workflows/publish-12.yml | 2 +- .github/workflows/publish-13.yml | 2 +- .github/workflows/publish-14.yml | 2 +- 12/{ => overlay/tmp}/POSTGRESQL_MINOR | 0 13/{ => overlay/tmp}/POSTGRESQL_MINOR | 0 14/{ => overlay/tmp}/POSTGRESQL_MINOR | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename 12/{ => overlay/tmp}/POSTGRESQL_MINOR (100%) rename 13/{ => overlay/tmp}/POSTGRESQL_MINOR (100%) rename 14/{ => overlay/tmp}/POSTGRESQL_MINOR (100%) diff --git a/.github/workflows/publish-12.yml b/.github/workflows/publish-12.yml index b77aa11..f9c86c1 100644 --- a/.github/workflows/publish-12.yml +++ b/.github/workflows/publish-12.yml @@ -20,7 +20,7 @@ jobs: name: Read PostgreSQL version - minor uses: bfren/read-file@v1 with: - file: ./12/POSTGRESQL_MINOR + file: ./12/overlay/tmp/POSTGRESQL_MINOR id: postgresql_minor - name: Read image version diff --git a/.github/workflows/publish-13.yml b/.github/workflows/publish-13.yml index 1797b15..a9671c7 100644 --- a/.github/workflows/publish-13.yml +++ b/.github/workflows/publish-13.yml @@ -20,7 +20,7 @@ jobs: name: Read PostgreSQL version - minor uses: bfren/read-file@v1 with: - file: ./13/POSTGRESQL_MINOR + file: ./13/overlay/tmp/POSTGRESQL_MINOR id: postgresql_minor - name: Read image version diff --git a/.github/workflows/publish-14.yml b/.github/workflows/publish-14.yml index 8ade918..cf1425a 100644 --- a/.github/workflows/publish-14.yml +++ b/.github/workflows/publish-14.yml @@ -20,7 +20,7 @@ jobs: name: Read PostgreSQL version - minor uses: bfren/read-file@v1 with: - file: ./14/POSTGRESQL_MINOR + file: ./14/overlay/tmp/POSTGRESQL_MINOR id: postgresql_minor - name: Read image version diff --git a/12/POSTGRESQL_MINOR b/12/overlay/tmp/POSTGRESQL_MINOR similarity index 100% rename from 12/POSTGRESQL_MINOR rename to 12/overlay/tmp/POSTGRESQL_MINOR diff --git a/13/POSTGRESQL_MINOR b/13/overlay/tmp/POSTGRESQL_MINOR similarity index 100% rename from 13/POSTGRESQL_MINOR rename to 13/overlay/tmp/POSTGRESQL_MINOR diff --git a/14/POSTGRESQL_MINOR b/14/overlay/tmp/POSTGRESQL_MINOR similarity index 100% rename from 14/POSTGRESQL_MINOR rename to 14/overlay/tmp/POSTGRESQL_MINOR