Skip to content

Commit cf6f9b1

Browse files
committed
feat: Provide new image tags just with major image version and full image version
These new image tags are based on nginx-stable.
1 parent 68908e0 commit cf6f9b1

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM psanetra/git-semver:0.4.0
1+
FROM psanetra/git-semver:1.1.1
22
COPY ./action /action
33
ENTRYPOINT ["/action"]

.github/actions/determine-target-image-tags/action

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ if [ "${VERSION}" = "${LATEST_VERSION_BY_MAJOR}" ]; then
4343
if [ "${VERSION}" = "${GLOBAL_LATEST_VERSION}" ]; then
4444
TAGS="${TAGS},${DOCKER_REPOSITORY}:${LATEST_IMAGE_TAG}"
4545

46-
# The "latest" tag should be based on nginx:stable-alpine
46+
# The "latest" and MAJOR_VERSION tags should be based on nginx:MAJOR_VERSION-nginx-stable-alpine
4747
if [ "${MATRIX_NGINX}" = "stable" ]; then
48-
TAGS="${TAGS},${DOCKER_REPOSITORY}:latest"
48+
TAGS="${TAGS},${DOCKER_REPOSITORY}:${VERSION},${DOCKER_REPOSITORY}:${MAJOR_VERSION},${DOCKER_REPOSITORY}:latest"
4949
fi
5050
fi
5151
fi

.github/workflows/update.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
echo "IMAGE_NAME=${IMAGE_NAME}"
3939
TAGS="${{ secrets.DOCKER_REPOSITORY }}:${IMAGE_TAG}"
4040
if [ "latest" = "${{ matrix.spa_server_major_version }}" ] && [ "stable" = "${{ matrix.nginx }}" ]; then
41-
TAGS="${TAGS},${{ secrets.DOCKER_REPOSITORY }}:latest"
41+
TAGS="${TAGS},${{ secrets.DOCKER_REPOSITORY }}:${{ matrix.spa_server_major_version }},${{ secrets.DOCKER_REPOSITORY }}:latest"
4242
fi
4343
echo "::set-output name=tags::${TAGS}"
4444
echo "TAGS=${TAGS}"

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ This image can be used as a base image for single page applications. It is itsel
77

88
The following tags will be updated automatically with the latest nginx base image on a weekly basis:
99

10-
* `latest`, `latest-nginx-mainline-alpine`, `1-nginx-mainline-alpine`
11-
* `latest-nginx-stable-alpine`, `1-nginx-stable-alpine`
10+
* `latest` (alias for `1-nginx-stable-alpine`)
11+
* `1` (alias for `1-nginx-stable-alpine`)
12+
* `latest-nginx-stable-alpine` (alias for `1-nginx-stable-alpine`)
13+
* `1-nginx-stable-alpine`
14+
* `latest-nginx-mainline-alpine` (alias for `1-nginx-mainline-alpine`)
15+
* `1-nginx-mainline-alpine`
1216

1317
There will also be tags for specific versions.
1418

0 commit comments

Comments
 (0)