v1.0.6 (#7)

bfren · web-flow · commit f96ff8d0e2ba · 2021-11-13T16:07:29.000Z
Minor updates
* Using latest base images
* Updating PostgreSQL to 14.1, changing installation script to reflect new Alpine package name

Build upates
* Adding major / minor to image tags
diff --git a/.github/workflows/publish-12.yml b/.github/workflows/publish-12.yml
@@ -24,6 +24,18 @@ jobs:
         with:
           file: ./12/POSTGRESQL_BUILD
         id: postgresql_build
+      -
+        name: Read image version
+        uses: bfren/read-file@v1
+        with:
+          file: ./VERSION_MAJOR
+        id: version_major
+      -
+        name: Read image version
+        uses: bfren/read-file@v1
+        with:
+          file: ./VERSION_MINOR
+        id: version_minor
       -
         name: Read image version
         uses: bfren/read-file@v1
@@ -53,6 +65,8 @@ jobs:
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
             bfren/postgresql:postgresql12
+            bfren/postgresql:postgresql12-${{ steps.version_major.outputs.contents }}
+            bfren/postgresql:postgresql12-${{ steps.version_minor.outputs.contents }}
             bfren/postgresql:postgresql12-${{ steps.version.outputs.contents }}
             bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}
             bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
diff --git a/.github/workflows/publish-13.yml b/.github/workflows/publish-13.yml
@@ -24,6 +24,18 @@ jobs:
         with:
           file: ./13/POSTGRESQL_BUILD
         id: postgresql_build
+      -
+        name: Read image version
+        uses: bfren/read-file@v1
+        with:
+          file: ./VERSION_MAJOR
+        id: version_major
+      -
+        name: Read image version
+        uses: bfren/read-file@v1
+        with:
+          file: ./VERSION_MINOR
+        id: version_minor
       -
         name: Read image version
         uses: bfren/read-file@v1
@@ -53,8 +65,12 @@ jobs:
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
             bfren/postgresql:latest
+            bfren/postgresql:${{ steps.version_major.outputs.contents }}
+            bfren/postgresql:${{ steps.version_minor.outputs.contents }}
             bfren/postgresql:${{ steps.version.outputs.contents }}
             bfren/postgresql:postgresql13
+            bfren/postgresql:postgresql13-${{ steps.version_major.outputs.contents }}
+            bfren/postgresql:postgresql13-${{ steps.version_minor.outputs.contents }}
             bfren/postgresql:postgresql13-${{ steps.version.outputs.contents }}
             bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}
             bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
diff --git a/.github/workflows/publish-14.yml b/.github/workflows/publish-14.yml
@@ -24,6 +24,18 @@ jobs:
         with:
           file: ./14/POSTGRESQL_BUILD
         id: postgresql_build
+      -
+        name: Read image version
+        uses: bfren/read-file@v1
+        with:
+          file: ./VERSION_MAJOR
+        id: version_major
+      -
+        name: Read image version
+        uses: bfren/read-file@v1
+        with:
+          file: ./VERSION_MINOR
+        id: version_minor
       -
         name: Read image version
         uses: bfren/read-file@v1
@@ -53,6 +65,8 @@ jobs:
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
             bfren/postgresql:postgresql14
+            bfren/postgresql:postgresql14-${{ steps.version_major.outputs.contents }}
+            bfren/postgresql:postgresql14-${{ steps.version_minor.outputs.contents }}
             bfren/postgresql:postgresql14-${{ steps.version.outputs.contents }}
             bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}
             bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
diff --git a/12/Dockerfile b/12/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.12-2.2.20
+FROM bfren/alpine-s6:alpine3.12-2.3.0
 
 ENV \
     # set to "1" to compress backup sql files
diff --git a/13/Dockerfile b/13/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.14-2.2.20
+FROM bfren/alpine-s6:alpine3.14-2.3.0
 
 ENV \
     # set to "1" to compress backup sql files
diff --git a/14/Dockerfile b/14/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpineedge-2.2.20
+FROM bfren/alpine-s6:alpineedge-2.3.0
 
 ENV \
     # set to "1" to compress backup sql files
diff --git a/14/POSTGRESQL_BUILD b/14/POSTGRESQL_BUILD
@@ -1 +1 @@
-14.0-r6
+14.1-r1
diff --git a/14/POSTGRESQL_MINOR b/14/POSTGRESQL_MINOR
@@ -1 +1 @@
-14.0
+14.1
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.5
+1.0.6
diff --git a/VERSION_MAJOR b/VERSION_MAJOR
@@ -0,0 +1 @@
+1
diff --git a/VERSION_MINOR b/VERSION_MINOR
@@ -0,0 +1 @@
+1.0
diff --git a/overlay/tmp/install b/overlay/tmp/install
@@ -26,8 +26,15 @@ bf-debug "PostgreSQL version ${VERSION}."
 #======================================================================================================================
 
 bf-echo "Installing PostgreSQL v${VERSION}..."
-apk add --no-cache \
-    postgresql=${VERSION}
+
+if [ "$(echo ${VERSION} | cut -c 1-2)" == "14" ] ; then
+    apk add --no-cache \
+        postgresql14=${VERSION}
+else
+    apk add --no-cache \
+        postgresql=${VERSION}
+fi
+
 bf-done
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM bfren/alpine-s6:alpine3.12-2.2.20`
	`1`	`+FROM bfren/alpine-s6:alpine3.12-2.3.0`
`2`	`2`
`3`	`3`	`ENV \`
`4`	`4`	`# set to "1" to compress backup sql files`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM bfren/alpine-s6:alpine3.14-2.2.20`
	`1`	`+FROM bfren/alpine-s6:alpine3.14-2.3.0`
`2`	`2`
`3`	`3`	`ENV \`
`4`	`4`	`# set to "1" to compress backup sql files`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM bfren/alpine-s6:alpineedge-2.2.20`
	`1`	`+FROM bfren/alpine-s6:alpineedge-2.3.0`
`2`	`2`
`3`	`3`	`ENV \`
`4`	`4`	`# set to "1" to compress backup sql files`