Skip to content

Commit bfa0b24

Browse files
bfrenbfren
authored
v3.2.0 (#102)
Major updates * Adding new test framework Minor updates * Using latest base images
1 parent 9213e11 commit bfa0b24

File tree

14 files changed

+73
-15
lines changed

14 files changed

+73
-15
lines changed

‎.github/workflows/dev.yml‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@ on:
66
tags-ignore: ['**']
77
workflow_dispatch:
88

9+
env:
10+
TEST_TAG: postgresql:test
11+
912
jobs:
10-
test:
11-
runs-on: ubuntu-latest
12-
steps:
13-
-
14-
name: Checkout code
15-
uses: actions/checkout@v4
1613
build:
1714
strategy:
1815
fail-fast: false
@@ -45,6 +42,29 @@ jobs:
4542
with:
4643
username: ${{ secrets.DOCKERHUB_USERNAME }}
4744
password: ${{ secrets.DOCKERHUB_TOKEN }}
45+
-
46+
name: Login to GitHub Container Registry
47+
uses: docker/login-action@v3
48+
with:
49+
registry: ghcr.io
50+
username: ${{ github.repository_owner }}
51+
password: ${{ secrets.GITHUB_TOKEN }}
52+
-
53+
name: Build and export
54+
id: docker_export
55+
uses: docker/build-push-action@v5
56+
with:
57+
file: ./${{ matrix.postgresql }}/Dockerfile
58+
build-args: |
59+
BF_IMAGE=${{ env.REPOSITORY_NAME }}
60+
BF_VERSION=${{ steps.version.outputs.contents }}
61+
load: true
62+
tags: ${{ env.TEST_TAG }}
63+
-
64+
name: Run tests
65+
id: docker_test
66+
run: |
67+
docker run --entrypoint "/usr/bin/env" ${{ env.TEST_TAG }} -i nu -c "use bf test ; test"
4868
-
4969
name: Build and push
5070
id: docker_build
@@ -60,6 +80,8 @@ jobs:
6080
tags: |
6181
bfren/postgresql:postgresql${{ matrix.postgresql }}-dev
6282
bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}-dev
83+
ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-dev
84+
ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}-dev
6385
-
6486
name: Image digest
6587
run: echo ${{ steps.docker_build.outputs.digest }}

‎.github/workflows/publish.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ jobs:
5656
with:
5757
username: ${{ secrets.DOCKERHUB_USERNAME }}
5858
password: ${{ secrets.DOCKERHUB_TOKEN }}
59+
-
60+
name: Login to GitHub Container Registry
61+
uses: docker/login-action@v3
62+
with:
63+
registry: ghcr.io
64+
username: ${{ github.repository_owner }}
65+
password: ${{ secrets.GITHUB_TOKEN }}
5966
-
6067
name: Build and push
6168
id: docker_build
@@ -65,6 +72,7 @@ jobs:
6572
file: ./${{ matrix.postgresql }}/Dockerfile
6673
build-args: |
6774
BF_IMAGE=${{ env.REPOSITORY_NAME }}
75+
BF_PUBLISHING=1
6876
BF_VERSION=${{ steps.version.outputs.contents }}
6977
push: true
7078
platforms: linux/amd64,linux/arm/v7,linux/arm64
@@ -75,6 +83,12 @@ jobs:
7583
bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}
7684
bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}
7785
bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
86+
ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}
87+
ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version_major.outputs.contents }}
88+
ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version_minor.outputs.contents }}
89+
ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}
90+
ghcr.io/bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}
91+
ghcr.io/bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
7892
-
7993
name: Image digest
8094
run: echo ${{ steps.docker_build.outputs.digest }}

‎12/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
FROM bfren/alpine-s6:alpine3.18-5.1.4
1+
FROM bfren/alpine-s6:alpine3.18-5.2.2
22

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

55
ARG BF_IMAGE
6+
ARG BF_PUBLISHING
67
ARG BF_VERSION
78

89
EXPOSE 5432

‎13/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
FROM bfren/alpine-s6:alpine3.19-5.1.4
1+
FROM bfren/alpine-s6:alpine3.19-5.2.2
22

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

55
ARG BF_IMAGE
6+
ARG BF_PUBLISHING
67
ARG BF_VERSION
78

89
EXPOSE 5432

‎14/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
FROM bfren/alpine-s6:alpine3.19-5.1.4
1+
FROM bfren/alpine-s6:alpine3.19-5.2.2
22

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

55
ARG BF_IMAGE
6+
ARG BF_PUBLISHING
67
ARG BF_VERSION
78

89
EXPOSE 5432

‎15/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
FROM bfren/alpine-s6:alpine3.19-5.1.4
1+
FROM bfren/alpine-s6:alpine3.19-5.2.2
22

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

55
ARG BF_IMAGE
6+
ARG BF_PUBLISHING
67
ARG BF_VERSION
78

89
EXPOSE 5432

‎16/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
FROM bfren/alpine-s6:alpine3.19-5.1.4
1+
FROM bfren/alpine-s6:alpine3.19-5.2.2
22

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

55
ARG BF_IMAGE
6+
ARG BF_PUBLISHING
67
ARG BF_VERSION
78

89
EXPOSE 5432

‎Dockerfile.esh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM bfren/alpine-s6:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %>
33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
44

55
ARG BF_IMAGE
6+
ARG BF_PUBLISHING
67
ARG BF_VERSION
78

89
EXPOSE 5432

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.6
1+
3.2.0

‎VERSION_MINOR‎

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

0 commit comments

Comments
 (0)