Skip to content

Commit b0114bd

Browse files
authored
v2.4.0 (#49)
Major updates * Using latest base image Build updates * Adding image name / version to builds
1 parent 8b218dc commit b0114bd

File tree

5 files changed

+20
-3
lines changed

5 files changed

+20
-3
lines changed

.github/workflows/dev.yml

+7
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ jobs:
2121
-
2222
name: Checkout code
2323
uses: actions/checkout@v2
24+
-
25+
name: Get repository name
26+
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
27+
shell: bash
2428
-
2529
name: Read image version
2630
uses: bfren/read-file@v1
@@ -44,6 +48,9 @@ jobs:
4448
id: docker_build
4549
uses: docker/build-push-action@v2
4650
with:
51+
build-args: |
52+
BF_IMAGE=${{ env.REPOSITORY_NAME }}
53+
BF_VERSION=${{ steps.version.outputs.contents }}
4754
push: ${{ startsWith(github.ref, 'refs/heads/') }}
4855
platforms: linux/amd64,linux/arm/v7,linux/arm64
4956
tags: |

.github/workflows/publish.yml

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ jobs:
1212
-
1313
name: Checkout code
1414
uses: actions/checkout@v2
15+
-
16+
name: Get repository name
17+
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
18+
shell: bash
1519
-
1620
name: Read image version
1721
uses: bfren/read-file@v1
@@ -47,6 +51,9 @@ jobs:
4751
id: docker_build
4852
uses: docker/build-push-action@v2
4953
with:
54+
build-args: |
55+
BF_IMAGE=${{ env.REPOSITORY_NAME }}
56+
BF_VERSION=${{ steps.version.outputs.contents }}
5057
push: true
5158
platforms: linux/amd64,linux/arm/v7,linux/arm64
5259
tags: |

Dockerfile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
FROM bfren/nginx:nginx1.20-2.3.0
1+
FROM bfren/nginx:nginx1.20-2.4.0
2+
3+
ARG BF_IMAGE
4+
ARG BF_VERSION
25

36
ENV \
47
# set to "r" or "rw" to enable read-only / read-write access

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.0
1+
2.4.0

VERSION_MINOR

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3
1+
2.4

0 commit comments

Comments
 (0)