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 .github/workflows/auto-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
-
name: Checkout Branch ${{ github.ref_name }}
uses: actions/checkout@v4
uses: actions/checkout@v6
-
name: Create Pull Request
run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}."
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
-
name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v6
-
name: Get repository name
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
Expand All @@ -43,12 +43,12 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Login to GitHub Container Registry
name: Login to Quay.io Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
registry: quay.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
password: ${{ secrets.QUAY_TOKEN }}
-
name: Build and export
id: docker_export
Expand Down Expand Up @@ -80,8 +80,8 @@ jobs:
tags: |
bfren/postgresql:postgresql${{ matrix.postgresql }}-dev
bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}-dev
ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-dev
ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}-dev
quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-dev
quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}-dev
-
name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
20 changes: 10 additions & 10 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
-
name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v6
-
name: Get repository name
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
Expand Down Expand Up @@ -57,12 +57,12 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Login to GitHub Container Registry
name: Login to Quay.io Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
registry: quay.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
password: ${{ secrets.QUAY_TOKEN }}
-
name: Build and push
id: docker_build
Expand All @@ -83,12 +83,12 @@ jobs:
bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}
bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}
bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}
ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version_major.outputs.contents }}
ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version_minor.outputs.contents }}
ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}
ghcr.io/bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}
ghcr.io/bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}
quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version_major.outputs.contents }}
quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version_minor.outputs.contents }}
quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}
quay.io/bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}
quay.io/bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
-
name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
2 changes: 1 addition & 1 deletion .github/workflows/update-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
shell: bash
-
name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v6
-
name: Login to DockerHub
uses: docker/login-action@v3
Expand Down
2 changes: 1 addition & 1 deletion 12/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.6.7
FROM quay.io/bfren/alpine-s6:alpine3.18-6.0.1

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 ghcr.io/bfren/alpine-s6:alpine3.19-5.6.7
FROM quay.io/bfren/alpine-s6:alpine3.19-6.0.1

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 ghcr.io/bfren/alpine-s6:alpine3.20-5.6.7
FROM quay.io/bfren/alpine-s6:alpine3.20-6.0.1

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 ghcr.io/bfren/alpine-s6:alpine3.22-5.6.7
FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1

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

Expand Down
2 changes: 1 addition & 1 deletion 15/overlay/tmp/POSTGRESQL_BUILD
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15.14-r0
15.15-r0
2 changes: 1 addition & 1 deletion 15/overlay/tmp/POSTGRESQL_MINOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15.14
15.15
2 changes: 1 addition & 1 deletion 16/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/alpine-s6:alpine3.22-5.6.7
FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1

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

Expand Down
2 changes: 1 addition & 1 deletion 16/overlay/tmp/POSTGRESQL_BUILD
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.10-r0
16.11-r0
2 changes: 1 addition & 1 deletion 16/overlay/tmp/POSTGRESQL_MINOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.10
16.11
2 changes: 1 addition & 1 deletion 17/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/alpine-s6:alpine3.22-5.6.7
FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1

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

Expand Down
2 changes: 1 addition & 1 deletion 17/overlay/tmp/POSTGRESQL_BUILD
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17.6-r0
17.7-r0
2 changes: 1 addition & 1 deletion 17/overlay/tmp/POSTGRESQL_MINOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17.6
17.7
2 changes: 1 addition & 1 deletion Dockerfile.esh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/alpine-s6:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %>
FROM quay.io/bfren/alpine-s6:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %>

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 @@
3.4.5
4.0.0
2 changes: 1 addition & 1 deletion VERSION_MAJOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3
4
2 changes: 1 addition & 1 deletion VERSION_MINOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4
4.0
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="5.6.7"
BASE_VERSION="6.0.1"
echo "Base: ${BASE_VERSION}"

POSTGRESQL_VERSIONS="12 13 14 15 16 17"
Expand Down
2 changes: 1 addition & 1 deletion overlay/etc/bf/init.d/13-cron.nu
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ use bf-s6
bf env load

# Append backup task to crontab
def main [] { bf-s6 crontab append --min (random int 1..59 | into string) --hour "*/8" "pg-dump" }
def main [] { bf-s6 crontab add --min (random int 1..59 | into string) --hour "*/8" "pg-dump" }