Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 12/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.18-6.3.3
FROM quay.io/bfren/alpine-s6:alpine3.18-6.4.0

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

Expand Down
2 changes: 1 addition & 1 deletion 13/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.19-6.3.3
FROM quay.io/bfren/alpine-s6:alpine3.19-6.4.0

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

Expand Down
2 changes: 1 addition & 1 deletion 14/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.20-6.3.3
FROM quay.io/bfren/alpine-s6:alpine3.20-6.4.0

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

Expand Down
2 changes: 1 addition & 1 deletion 15/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.22-6.3.3
FROM quay.io/bfren/alpine-s6:alpine3.22-6.4.0

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

Expand Down
2 changes: 1 addition & 1 deletion 16/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.3
FROM quay.io/bfren/alpine-s6:alpine3.24-6.4.0

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

Expand Down
2 changes: 1 addition & 1 deletion 17/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.3
FROM quay.io/bfren/alpine-s6:alpine3.24-6.4.0

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

Expand Down
2 changes: 1 addition & 1 deletion 18/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.3
FROM quay.io/bfren/alpine-s6:alpine3.24-6.4.0

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

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2.13
4.2.14
2 changes: 1 addition & 1 deletion generate-dockerfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail

docker pull bfren/alpine

BASE_VERSION="6.3.3"
BASE_VERSION="6.4.0"
echo "Base: ${BASE_VERSION}"

POSTGRESQL_VERSIONS="12 13 14 15 16 17 18"
Expand Down
8 changes: 3 additions & 5 deletions overlay/etc/s6-overlay/s6-rc.d/postgresql/finish
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,15 @@ use bf-postgresql
use bf-s6
bf env load -x postgresql

# Stop server and terminate container, unless we are restoring from a backup
# Terminate container, unless we are restoring from a backup
# PostgreSQL itself is stopped by s6 using the signal in ./down-signal (SIGINT = fast shutdown)
def main [...args] {
# check whether or not we are restoring from a backup
if (bf-postgresql restore is_restoring) {
bf write debug "A restore operation is running: do not stop PostgreSQL or terminate the container."
exit 0
}

# stop server gracefully
bf-postgresql ctl stop

# terminate container
bf-s6 svc finish --terminate
bf-s6 svc finish --terminate ...$args
}
Loading