From 7240cb99cd52ca280702a211edc38a2e3c7b6a93 Mon Sep 17 00:00:00 2001 From: Pavel Grachev Date: Fri, 17 Nov 2023 10:34:53 +0100 Subject: [PATCH 1/5] Base the image on alpine 3.18 with node v18 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 70c4419..e91636b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14@sha256:eb3e4e175ba6d212ba1d6e04fc0782916c08e1c9d7b45892e9796141b1d379ae +FROM alpine:3.18@sha256:c0669ef34cdc14332c0f1ab0c2c01acb91d96014b172f1a76f3a39e63d1f0bda LABEL maintainer="Atomist " @@ -9,11 +9,11 @@ RUN apk add --no-cache \ # Install Node.js RUN apk add --no-cache \ - nodejs=18.18.0-r0 + nodejs=18.18.2-r0 # Install Git RUN apk add --no-cache \ - git=2.42.0-r0 + git=2.40.1-r0 # ENV VARs needed for Node.js ENV BLUEBIRD_WARNINGS=0 \ From 114f7b3a12bca5ea2131e91b7d3b957a8589d6b5 Mon Sep 17 00:00:00 2001 From: Pavel Grachev Date: Fri, 17 Nov 2023 11:17:41 +0100 Subject: [PATCH 2/5] Skip `load` option for `build-and-push` --- .github/workflows/docker-publish.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 1abe212..ead05ff 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -79,7 +79,5 @@ jobs: platforms: "linux/amd64,linux/arm64" context: . push: ${{ github.event_name != 'pull_request' }} - load: ${{ github.event_name == 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - From 86cf4c69322ea8d1204973c3f5aaaa8ee0f93f7f Mon Sep 17 00:00:00 2001 From: Pavel Grachev Date: Fri, 17 Nov 2023 11:23:42 +0100 Subject: [PATCH 3/5] digest --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e91636b..ca15a14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18@sha256:c0669ef34cdc14332c0f1ab0c2c01acb91d96014b172f1a76f3a39e63d1f0bda +FROM alpine:3.18@sha256:48d9183eb12a05c99bcc0bf44a003607b8e941e1d4f41f9ad12bdcc4b5672f86 LABEL maintainer="Atomist " From 61f2662b88cb78d9d799bebe0d3fa5e20faa6231 Mon Sep 17 00:00:00 2001 From: Pavel Grachev Date: Fri, 17 Nov 2023 11:39:36 +0100 Subject: [PATCH 4/5] Include 3.18 instead of `edge` in the image tag --- .github/workflows/docker-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index ead05ff..7089bb3 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -66,7 +66,7 @@ jobs: with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | - type=raw,value=alpine_edge-node_18 + type=raw,value=alpine_3.18-node_18 labels: | org.opencontainers.image.revision=${{ env.SHA }} From 0ce4424b477e5cb16d290350e840586bc334e850 Mon Sep 17 00:00:00 2001 From: Pavel Grachev Date: Fri, 17 Nov 2023 16:17:57 +0100 Subject: [PATCH 5/5] Pin correct index digest --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ca15a14..c43d744 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18@sha256:48d9183eb12a05c99bcc0bf44a003607b8e941e1d4f41f9ad12bdcc4b5672f86 +FROM alpine:3.18@sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c016293fc851978 LABEL maintainer="Atomist "