Skip to content

Commit 8709919

Browse files
bfrenbfren
authored
v2.3.0 (#63)
Major updates * Adding PostgreSQL 15 Minor updates * Updating to PostgreSQL 12.13, 13.9 and 14.6 * Using Alpine 3.17 base image Documentation updates * Updating README with 15
1 parent e87999f commit 8709919

19 files changed

+198
-16
lines changed

‎.github/workflows/dev-15.yml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: dev-15
2+
3+
on:
4+
push:
5+
branches: ['**']
6+
tags-ignore: ['**']
7+
workflow_dispatch:
8+
9+
jobs:
10+
test-15:
11+
runs-on: ubuntu-latest
12+
steps:
13+
-
14+
name: Checkout code
15+
uses: actions/checkout@v3
16+
build-15:
17+
runs-on: ubuntu-latest
18+
steps:
19+
-
20+
name: Checkout code
21+
uses: actions/checkout@v3
22+
-
23+
name: Get repository name
24+
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
25+
shell: bash
26+
-
27+
name: Read image version
28+
uses: bfren/read-file@v2
29+
with:
30+
file: ./VERSION
31+
id: version
32+
-
33+
name: Set up QEMU
34+
uses: docker/setup-qemu-action@v2
35+
-
36+
name: Set up Docker Buildx
37+
uses: docker/setup-buildx-action@v2
38+
-
39+
name: Login to DockerHub
40+
uses: docker/login-action@v2
41+
with:
42+
username: ${{ secrets.DOCKERHUB_USERNAME }}
43+
password: ${{ secrets.DOCKERHUB_TOKEN }}
44+
-
45+
name: Login to GitHub Container Registry
46+
uses: docker/login-action@v2
47+
with:
48+
registry: ghcr.io
49+
username: ${{ github.repository_owner }}
50+
password: ${{ secrets.GITHUB_TOKEN }}
51+
-
52+
name: Build and push
53+
id: docker_build
54+
uses: docker/build-push-action@v3
55+
with:
56+
context: .
57+
file: ./15/Dockerfile
58+
build-args: |
59+
BF_IMAGE=${{ env.REPOSITORY_NAME }}
60+
BF_VERSION=${{ steps.version.outputs.contents }}
61+
push: ${{ startsWith(github.ref, 'refs/heads/') }}
62+
platforms: linux/amd64,linux/arm/v7,linux/arm64
63+
tags: |
64+
bfren/postgresql:postgresql15-dev
65+
bfren/postgresql:postgresql15-${{ steps.version.outputs.contents }}-beta
66+
ghcr.io/bfren/postgresql:postgresql15-dev
67+
ghcr.io/bfren/postgresql:postgresql15-${{ steps.version.outputs.contents }}-beta
68+
-
69+
name: Image digest
70+
run: echo ${{ steps.docker_build.outputs.digest }}

‎.github/workflows/publish-15.yml

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: publish-15
2+
3+
on:
4+
release:
5+
types: [published]
6+
workflow_dispatch:
7+
8+
jobs:
9+
publish-15:
10+
runs-on: ubuntu-latest
11+
steps:
12+
-
13+
name: Checkout code
14+
uses: actions/checkout@v3
15+
-
16+
name: Get repository name
17+
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
18+
shell: bash
19+
-
20+
name: Read PostgreSQL version - minor
21+
uses: bfren/read-file@v2
22+
with:
23+
file: ./15/overlay/tmp/POSTGRESQL_MINOR
24+
id: postgresql_minor
25+
-
26+
name: Read image version
27+
uses: bfren/read-file@v2
28+
with:
29+
file: ./VERSION_MAJOR
30+
id: version_major
31+
-
32+
name: Read image version
33+
uses: bfren/read-file@v2
34+
with:
35+
file: ./VERSION_MINOR
36+
id: version_minor
37+
-
38+
name: Read image version
39+
uses: bfren/read-file@v2
40+
with:
41+
file: ./VERSION
42+
id: version
43+
-
44+
name: Set up QEMU
45+
uses: docker/setup-qemu-action@v2
46+
-
47+
name: Set up Docker Buildx
48+
uses: docker/setup-buildx-action@v2
49+
-
50+
name: Login to DockerHub
51+
uses: docker/login-action@v2
52+
with:
53+
username: ${{ secrets.DOCKERHUB_USERNAME }}
54+
password: ${{ secrets.DOCKERHUB_TOKEN }}
55+
-
56+
name: Login to GitHub Container Registry
57+
uses: docker/login-action@v2
58+
with:
59+
registry: ghcr.io
60+
username: ${{ github.repository_owner }}
61+
password: ${{ secrets.GITHUB_TOKEN }}
62+
-
63+
name: Build and push
64+
id: docker_build
65+
uses: docker/build-push-action@v3
66+
with:
67+
context: .
68+
file: ./15/Dockerfile
69+
build-args: |
70+
BF_IMAGE=${{ env.REPOSITORY_NAME }}
71+
BF_VERSION=${{ steps.version.outputs.contents }}
72+
push: true
73+
platforms: linux/amd64,linux/arm/v7,linux/arm64
74+
tags: |
75+
bfren/postgresql:postgresql15
76+
bfren/postgresql:postgresql15-${{ steps.version_major.outputs.contents }}
77+
bfren/postgresql:postgresql15-${{ steps.version_minor.outputs.contents }}
78+
bfren/postgresql:postgresql15-${{ steps.version.outputs.contents }}
79+
bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}
80+
bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
81+
ghcr.io/bfren/postgresql:postgresql15
82+
ghcr.io/bfren/postgresql:postgresql15-${{ steps.version_major.outputs.contents }}
83+
ghcr.io/bfren/postgresql:postgresql15-${{ steps.version_minor.outputs.contents }}
84+
ghcr.io/bfren/postgresql:postgresql15-${{ steps.version.outputs.contents }}
85+
ghcr.io/bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}
86+
ghcr.io/bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
87+
-
88+
name: Image digest
89+
run: echo ${{ steps.docker_build.outputs.digest }}

‎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.16-4.3.15
1+
FROM bfren/alpine-s6:alpine3.17-4.4.0
22

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

‎12/overlay/tmp/POSTGRESQL_BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.12-r0
1+
12.13-r1

‎12/overlay/tmp/POSTGRESQL_MINOR

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.12
1+
12.13

‎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.16-4.3.15
1+
FROM bfren/alpine-s6:alpine3.17-4.4.0
22

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

‎13/overlay/tmp/POSTGRESQL_BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
13.8-r0
1+
13.9-r1

‎13/overlay/tmp/POSTGRESQL_MINOR

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
13.8
1+
13.9

‎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.16-4.3.15
1+
FROM bfren/alpine-s6:alpine3.17-4.4.0
22

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

‎14/overlay/tmp/POSTGRESQL_BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.5-r0
1+
14.6-r1

‎14/overlay/tmp/POSTGRESQL_MINOR

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.5
1+
14.6

‎15/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.17-4.4.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+
ENV \
9+
# set to "1" to compress backup sql files
10+
POSTGRESQL_BACKUP_COMPRESS_FILES="0" \
11+
# the number of days after which backups will be deleted
12+
POSTGRESQL_BACKUP_KEEP_FOR_DAYS="28"
13+
14+
EXPOSE 5432
15+
16+
COPY ./overlay /
17+
COPY ./15/overlay /
18+
19+
RUN bf-install
20+
21+
VOLUME [ "/data", "/backup" ]

‎15/overlay/tmp/POSTGRESQL_BUILD

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

‎15/overlay/tmp/POSTGRESQL_MINOR

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
15.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.16-<%= ${BASE_REVISION} %>
1+
FROM bfren/alpine-s6:alpine3.17-<%= ${BASE_REVISION} %>
22

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

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Docker PostgreSQL
22

33
![GitHub release (latest by date)](https://img.shields.io/github/v/release/bfren/docker-postgresql) ![Docker Pulls](https://img.shields.io/endpoint?url=https%3A%2F%2Fbfren.dev%2Fdocker%2Fpulls%2Fpostgresql) ![Docker Image Size](https://img.shields.io/endpoint?url=https%3A%2F%2Fbfren.dev%2Fdocker%2Fsize%2Fpostgresql)<br/>
4-
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/bfren/docker-postgresql/dev-12?label=PostgreSQL+12) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/bfren/docker-postgresql/dev-13?label=PostgreSQL+13) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/bfren/docker-postgresql/dev-14?label=PostgreSQL+14)
4+
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/bfren/docker-postgresql/dev-12?label=PostgreSQL+12) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/bfren/docker-postgresql/dev-13?label=PostgreSQL+13) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/bfren/docker-postgresql/dev-14?label=PostgreSQL+14) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/bfren/docker-postgresql/dev-15?label=PostgreSQL+15)
55

66
[Docker Repository](https://hub.docker.com/r/bfren/postgresql) - [bfren ecosystem](https://github.com/bfren/docker)
77

8-
[PostgreSQL](https://www.postgresql.org/) comes pre-installed (12, 13, or 14) with automatic backups built-in.
8+
[PostgreSQL](https://www.postgresql.org/) comes pre-installed (12, 13, 14 or 15) with automatic backups built-in.
99

1010
## Contents
1111

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.16
1+
2.3.0

‎VERSION_MINOR

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2
1+
2.3

‎generate-dockerfiles.sh

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

55
docker pull bfren/alpine
66

7-
BASE_REVISION="4.3.15"
7+
BASE_REVISION="4.4.0"
88
echo "Base: ${BASE_REVISION}"
99

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

1313
echo "PostgreSQL ${V}"

0 commit comments

Comments
 (0)