v3.1.0 (#95)

bfren · web-flow · commit 497aacc87693 · 2023-12-09T11:37:13.000Z
Major updates
* Adding PostgreSQL 16 and switching to use Alpine 3.19 as base
* Supporting custom ALPINE_EDITION

Development updates
* Using PostgreSQL 16 as default in run.sh
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        postgresql: [ "12", "13", "14", "15" ]
+        postgresql: [ "12", "13", "14", "15", "16" ]
     runs-on: ubuntu-latest
     steps:
       -
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        postgresql: [ "12", "13", "14", "15" ]
+        postgresql: [ "12", "13", "14", "15", "16" ]
     runs-on: ubuntu-latest
     steps:
       -
diff --git a/12/ALPINE_EDITION b/12/ALPINE_EDITION
@@ -0,0 +1 @@
+3.18
diff --git a/12/Dockerfile b/12/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.18-5.0.5
+FROM bfren/alpine-s6:alpine3.18-5.1.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/13/Dockerfile b/13/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.18-5.0.5
+FROM bfren/alpine-s6:alpine3.19-5.1.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/14/Dockerfile b/14/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.18-5.0.5
+FROM bfren/alpine-s6:alpine3.19-5.1.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/15/Dockerfile b/15/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.18-5.0.5
+FROM bfren/alpine-s6:alpine3.19-5.1.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/16/Dockerfile b/16/Dockerfile
@@ -0,0 +1,21 @@
+FROM bfren/alpine-s6:alpine3.19-5.1.0
+
+LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
+
+ARG BF_IMAGE
+ARG BF_VERSION
+
+EXPOSE 5432
+
+COPY ./overlay /
+COPY ./16/overlay /
+
+ENV \
+    # set to "1" to compress backup sql files
+    BF_PG_BACKUP_COMPRESS_FILES="0" \
+    # the duration for which backups will be kept
+    BF_PG_BACKUP_KEEP_FOR="28day"
+
+RUN bf-install
+
+VOLUME [ "/backup", "/data" ]
diff --git a/16/overlay/tmp/POSTGRESQL_BUILD b/16/overlay/tmp/POSTGRESQL_BUILD
@@ -0,0 +1 @@
+16.1-r0
diff --git a/16/overlay/tmp/POSTGRESQL_MINOR b/16/overlay/tmp/POSTGRESQL_MINOR
@@ -0,0 +1 @@
+16.1
diff --git a/Dockerfile.esh b/Dockerfile.esh
@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.18-<%= ${BASE_VERSION} %>
+FROM bfren/alpine-s6:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %>
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.0
+3.1.0
diff --git a/VERSION_MINOR b/VERSION_MINOR
@@ -1 +1 @@
-3.0
+3.1
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
@@ -4,19 +4,26 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_VERSION="5.0.5"
+BASE_VERSION="5.1.0"
 echo "Base: ${BASE_VERSION}"
 
-POSTGRESQL_VERSIONS="12 13 14 15"
+POSTGRESQL_VERSIONS="12 13 14 15 16"
 for V in ${POSTGRESQL_VERSIONS} ; do
 
     echo "PostgreSQL ${V}"
+    ALPINE_EDITION_FILE="${V}/ALPINE_EDITION"
+    if [ -f "${ALPINE_EDITION_FILE}" ] ; then
+        ALPINE_EDITION=`cat ${ALPINE_EDITION_FILE}`
+    else
+        ALPINE_EDITION="3.19"
+    fi
 
     DOCKERFILE=$(docker run \
         -v ${PWD}:/ws \
         -e BF_DEBUG=0 \
         bfren/alpine esh \
         "/ws/Dockerfile.esh" \
+        ALPINE_EDITION=${ALPINE_EDITION} \
         BASE_VERSION=${BASE_VERSION} \
         POSTGRESQL_MAJOR=${V}
     )
diff --git a/run.sh b/run.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 IMAGE=`cat VERSION`
-POSTGRESQL=${1:-15}
+POSTGRESQL=${1:-16}
 
 docker buildx build \
     --load \

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ jobs:`
`17`	`17`	`strategy:`
`18`	`18`	`fail-fast: false`
`19`	`19`	`matrix:`
`20`		`- postgresql: [ "12", "13", "14", "15" ]`
	`20`	`+ postgresql: [ "12", "13", "14", "15", "16" ]`
`21`	`21`	`runs-on: ubuntu-latest`
`22`	`22`	`steps:`
`23`	`23`	`-`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ jobs:`
`10`	`10`	`strategy:`
`11`	`11`	`fail-fast: false`
`12`	`12`	`matrix:`
`13`		`- postgresql: [ "12", "13", "14", "15" ]`
	`13`	`+ postgresql: [ "12", "13", "14", "15", "16" ]`
`14`	`14`	`runs-on: ubuntu-latest`
`15`	`15`	`steps:`
`16`	`16`	`-`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM bfren/alpine-s6:alpine3.18-5.0.5`
	`1`	`+FROM bfren/alpine-s6:alpine3.18-5.1.0`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM bfren/alpine-s6:alpine3.18-5.0.5`
	`1`	`+FROM bfren/alpine-s6:alpine3.19-5.1.0`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"`
`4`	`4`