v3.0.0

.gitattributes

@@ -0,0 +1,2 @@
+# Always use LF endings.
+* text eol=lf

.github/workflows/auto-pr.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     -
       name: Checkout Branch ${{ github.ref_name }}
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     -
       name: Create Pull Request
       uses: bfren/pull-request@v2

.github/workflows/dev.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
   build:
     strategy:
       fail-fast: false
@@ -22,7 +22,7 @@ jobs:
     steps:
       -
         name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Get repository name
         run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
@@ -35,20 +35,20 @@ jobs:
         id: version
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       -
         name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./${{ matrix.postgresql }}/Dockerfile
@@ -59,7 +59,7 @@ jobs:
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
             bfren/postgresql:postgresql${{ matrix.postgresql }}-dev
-            bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}-beta
+            bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}-dev
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       -
         name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Get repository name
         run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
@@ -46,20 +46,20 @@ jobs:
         id: version
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       -
         name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./${{ matrix.postgresql }}/Dockerfile

.github/workflows/update-readme.yml

@@ -15,10 +15,10 @@ jobs:
         shell: bash
       -
         name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

12/Dockerfile

@@ -1,21 +1,21 @@
-FROM bfren/alpine-s6:alpine3.18-4.5.9
+FROM bfren/alpine-s6:alpine3.18-5.0.5
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
 ARG BF_IMAGE
 ARG BF_VERSION
 
-ENV \
-    # set to "1" to compress backup sql files
-    POSTGRESQL_BACKUP_COMPRESS_FILES="0" \
-    # the number of days after which backups will be deleted
-    POSTGRESQL_BACKUP_KEEP_FOR_DAYS="28"
-
 EXPOSE 5432
 
 COPY ./overlay /
 COPY ./12/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 [ "/data", "/backup" ]
+VOLUME [ "/backup", "/data" ]

12/overlay/tmp/POSTGRESQL_BUILD

@@ -1 +1 @@
-12.16-r0
+12.17-r0

12/overlay/tmp/POSTGRESQL_MINOR

@@ -1 +1 @@
-12.16
+12.17

13/Dockerfile

@@ -1,21 +1,21 @@
-FROM bfren/alpine-s6:alpine3.18-4.5.9
+FROM bfren/alpine-s6:alpine3.18-5.0.5
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
 ARG BF_IMAGE
 ARG BF_VERSION
 
-ENV \
-    # set to "1" to compress backup sql files
-    POSTGRESQL_BACKUP_COMPRESS_FILES="0" \
-    # the number of days after which backups will be deleted
-    POSTGRESQL_BACKUP_KEEP_FOR_DAYS="28"
-
 EXPOSE 5432
 
 COPY ./overlay /
 COPY ./13/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 [ "/data", "/backup" ]
+VOLUME [ "/backup", "/data" ]

13/overlay/tmp/POSTGRESQL_BUILD

@@ -1 +1 @@
-13.12-r0
+13.13-r0

13/overlay/tmp/POSTGRESQL_MINOR

@@ -1 +1 @@
-13.12
+13.13

14/Dockerfile

@@ -1,21 +1,21 @@
-FROM bfren/alpine-s6:alpine3.18-4.5.9
+FROM bfren/alpine-s6:alpine3.18-5.0.5
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
 ARG BF_IMAGE
 ARG BF_VERSION
 
-ENV \
-    # set to "1" to compress backup sql files
-    POSTGRESQL_BACKUP_COMPRESS_FILES="0" \
-    # the number of days after which backups will be deleted
-    POSTGRESQL_BACKUP_KEEP_FOR_DAYS="28"
-
 EXPOSE 5432
 
 COPY ./overlay /
 COPY ./14/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 [ "/data", "/backup" ]
+VOLUME [ "/backup", "/data" ]

14/overlay/tmp/POSTGRESQL_BUILD

@@ -1 +1 @@
-14.9-r0
+14.10-r0

14/overlay/tmp/POSTGRESQL_MINOR

@@ -1 +1 @@
-14.9
+14.10

15/Dockerfile

@@ -1,21 +1,21 @@
-FROM bfren/alpine-s6:alpine3.18-4.5.9
+FROM bfren/alpine-s6:alpine3.18-5.0.5
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
 ARG BF_IMAGE
 ARG BF_VERSION
 
-ENV \
-    # set to "1" to compress backup sql files
-    POSTGRESQL_BACKUP_COMPRESS_FILES="0" \
-    # the number of days after which backups will be deleted
-    POSTGRESQL_BACKUP_KEEP_FOR_DAYS="28"
-
 EXPOSE 5432
 
 COPY ./overlay /
 COPY ./15/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 [ "/data", "/backup" ]
+VOLUME [ "/backup", "/data" ]

15/overlay/tmp/POSTGRESQL_BUILD

@@ -1 +1 @@
-15.4-r0
+15.5-r0

15/overlay/tmp/POSTGRESQL_MINOR

@@ -1 +1 @@
-15.4
+15.5

Dockerfile.esh

@@ -1,21 +1,21 @@
-FROM bfren/alpine-s6:alpine3.18-<%= ${BASE_REVISION} %>
+FROM bfren/alpine-s6:alpine3.18-<%= ${BASE_VERSION} %>
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
 ARG BF_IMAGE
 ARG BF_VERSION
 
-ENV \
-    # set to "1" to compress backup sql files
-    POSTGRESQL_BACKUP_COMPRESS_FILES="0" \
-    # the number of days after which backups will be deleted
-    POSTGRESQL_BACKUP_KEEP_FOR_DAYS="28"
-
 EXPOSE 5432
 
 COPY ./overlay /
 COPY ./<%= ${POSTGRESQL_MAJOR} %>/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 [ "/data", "/backup" ]
+VOLUME [ "/backup", "/data" ]

README.md

@@ -40,29 +40,28 @@ See [For Backups](#for-backups) for configuration variables.
 
 ### For Backups
 
-| Variable                           | Values                       | Description                                              | Default |
-| ---------------------------------- | ---------------------------- | -------------------------------------------------------- | ------- |
-| `POSTGRESQL_BACKUP_COMPRESS_FILES` | 0 or 1                       | Whether or not to compress backup files (using gzip).    | 0       |
-| `POSTGRESQL_BACKUP_KEEP_FOR_DAYS`  | 0: keep forever<br>Num: days | How many days to keep backups before auto-deleting them. | 14      |
+| Variable                      | Values        | Description                                           | Default   |
+| ----------------------------- | ------------- | ----------------------------------------------------- | --------- |
+| `PG_BACKUP_COMPRESS_FILES`    | 0 or 1        | Whether or not to compress backup files (using bzip). | 0         |
+| `BF_PG_BACKUP_KEEP_FOR`       | Nu duration   | The length of time to keep backups.                   | 28day     |
 
 ### For Database
 
-| Variable              | Values | Description                                                                               | Default           |
-| --------------------- | ------ | ----------------------------------------------------------------------------------------- | ----------------- |
-| `POSTGRESQL_USERNAME` | string | Application username - will be used as database name if `POSTGRESQL_DATABASE` is not set. | *None* - required |
-| `POSTGRESQL_PASSWORD` | string | Application password.                                                                     | *None* - required |
-| `POSTGRESQL_DATABASE` | string | Database name(s) - multiple databases can be separated by a comma.                        | *None*            |
+| Variable          | Values | Description                                                                                              | Default   |
+| ----------------- | ------ | -------------------------------------------------------------------------------------------------------- | --------- |
+| `PG_APPLICATION`  | string | Application name - will be used as `PG_DATABASE`, `PG_PASSWORD` and `PG_USERNAME` if they are not set.   | *None*    |
+| `PG_DATABASE`     | string | Database name(s) - multiple databases can be separated by a comma.                                       | *None*    |
+| `PG_PASSWORD`     | string | Application password.                                                                                    | *None*    |
+| `PG_USERNAME`     | string | Application username.                                                                                    | *None*    |
 
 ## Helper Functions
 
-| Function     | Purpose                                                                                                                            | Usage                                               |
-| ------------ | ---------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------- |
-| `db-backup`  | Run backup manually.                                                                                                               | `docker exec <<CONTAINER>> db-backup`               |
-| `db-exists`  | Echoes '0' or '1' depending on whether or not the specified database exists on the server.                                         | `docker exec <<CONTAINER>> db-exists "foo"`         |
-| `db-export`  | Dumps the specified database as a SQL file to the root of the `/backup` volume.                                                    | `docker exec <<CONTAINER>> db-export <<DB_NAME>>`   |
-| `db-import`  | Executes all files in the root of the `/backup` volume.                                                                            | `docker exec <<CONTAINER>> db-import`               |
-| `db-restore` | Deletes all files in `/data` volume, then shuts container down - on restart, the container will restore from the specified backup. | `docker exec <<CONTAINER>> db-restore 202107180500` |
-| `db-stop`    | Stops the database server (will automatically terminate the container).                                                            | `docker exec <<CONTAINER>> db-stop`                 |
+| Function      | Arguments         | Purpose                                                                               | Usage                                                 |
+| ------------- | ----------------- | ------------------------------------------------------------------------------------- | ----------------------------------------------------- |
+| `pg-dump`     | *None*            | Run backup manually.                                                                  | `docker exec <<CONTAINER>> pg-dump`                   |
+| `pg-export`   | 1: Database name  | Dumps the specified database as a SQL file to the root of the `/backup` volume.       | `docker exec <<CONTAINER>> pg-export <<DB_NAME>>`     |
+| `pg-import`   | 1: Database name  | Executes all files in the root of the `/backup` volume.                               | `docker exec <<CONTAINER>> pg-import <<DB_NAME>>`     |
+| `pg-restore`  | 1: Backup set     | Deletes all files in `/data` volume, then restores from the specified backup dump.    | `docker exec <<CONTAINER>> pg-restore 202107180500`   |
 
 ## Licence
 

VERSION

@@ -1 +1 @@
-2.3.29
+3.0.0

VERSION_MAJOR

@@ -1 +1 @@
-2
+3

VERSION_MINOR

@@ -1 +1 @@
-2.3
+3.0

generate-dockerfiles.sh

@@ -4,8 +4,8 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_REVISION="4.5.9"
-echo "Base: ${BASE_REVISION}"
+BASE_VERSION="5.0.5"
+echo "Base: ${BASE_VERSION}"
 
 POSTGRESQL_VERSIONS="12 13 14 15"
 for V in ${POSTGRESQL_VERSIONS} ; do
@@ -17,7 +17,7 @@ for V in ${POSTGRESQL_VERSIONS} ; do
         -e BF_DEBUG=0 \
         bfren/alpine esh \
         "/ws/Dockerfile.esh" \
-        BASE_REVISION=${BASE_REVISION} \
+        BASE_VERSION=${BASE_VERSION} \
         POSTGRESQL_MAJOR=${V}
     )
 

overlay/etc/bf/ch.d/10-postgresql

@@ -1,4 +1,3 @@
-/backup postgres:postgres 0770 0750
-/data postgres:postgres 0770 0750
-/run/postgresql postgres:postgres 0770 0750
-/usr/bin/bf/db-exists root:root 0555
+/backup postgres:postgres 0600 0700
+/data postgres:postgres 0600 0700
+/run/postgresql postgres:postgres 0600 0700