Skip to content

Commit 497aacc

Browse files
authored
v3.1.0 (#95)
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
1 parent 98f917b commit 497aacc

15 files changed

+43
-12
lines changed

.github/workflows/dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
postgresql: [ "12", "13", "14", "15" ]
20+
postgresql: [ "12", "13", "14", "15", "16" ]
2121
runs-on: ubuntu-latest
2222
steps:
2323
-

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
postgresql: [ "12", "13", "14", "15" ]
13+
postgresql: [ "12", "13", "14", "15", "16" ]
1414
runs-on: ubuntu-latest
1515
steps:
1616
-

12/ALPINE_EDITION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.18

12/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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
22

33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
44

13/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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
22

33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
44

14/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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
22

33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
44

15/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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
22

33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
44

16/Dockerfile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
FROM bfren/alpine-s6:alpine3.19-5.1.0
2+
3+
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
4+
5+
ARG BF_IMAGE
6+
ARG BF_VERSION
7+
8+
EXPOSE 5432
9+
10+
COPY ./overlay /
11+
COPY ./16/overlay /
12+
13+
ENV \
14+
# set to "1" to compress backup sql files
15+
BF_PG_BACKUP_COMPRESS_FILES="0" \
16+
# the duration for which backups will be kept
17+
BF_PG_BACKUP_KEEP_FOR="28day"
18+
19+
RUN bf-install
20+
21+
VOLUME [ "/backup", "/data" ]

16/overlay/tmp/POSTGRESQL_BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
16.1-r0

16/overlay/tmp/POSTGRESQL_MINOR

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
16.1

Dockerfile.esh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM bfren/alpine-s6:alpine3.18-<%= ${BASE_VERSION} %>
1+
FROM bfren/alpine-s6:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %>
22

33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
44

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0
1+
3.1.0

VERSION_MINOR

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
3.1

generate-dockerfiles.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,26 @@ set -euo pipefail
44

55
docker pull bfren/alpine
66

7-
BASE_VERSION="5.0.5"
7+
BASE_VERSION="5.1.0"
88
echo "Base: ${BASE_VERSION}"
99

10-
POSTGRESQL_VERSIONS="12 13 14 15"
10+
POSTGRESQL_VERSIONS="12 13 14 15 16"
1111
for V in ${POSTGRESQL_VERSIONS} ; do
1212

1313
echo "PostgreSQL ${V}"
14+
ALPINE_EDITION_FILE="${V}/ALPINE_EDITION"
15+
if [ -f "${ALPINE_EDITION_FILE}" ] ; then
16+
ALPINE_EDITION=`cat ${ALPINE_EDITION_FILE}`
17+
else
18+
ALPINE_EDITION="3.19"
19+
fi
1420

1521
DOCKERFILE=$(docker run \
1622
-v ${PWD}:/ws \
1723
-e BF_DEBUG=0 \
1824
bfren/alpine esh \
1925
"/ws/Dockerfile.esh" \
26+
ALPINE_EDITION=${ALPINE_EDITION} \
2027
BASE_VERSION=${BASE_VERSION} \
2128
POSTGRESQL_MAJOR=${V}
2229
)

run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
IMAGE=`cat VERSION`
4-
POSTGRESQL=${1:-15}
4+
POSTGRESQL=${1:-16}
55

66
docker buildx build \
77
--load \

0 commit comments

Comments
 (0)