Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Node: fix: Use folder commmit for Stackbrew #10748

Merged
merged 1 commit into from
Aug 17, 2021
Merged

Conversation

nodejs-github-bot
Copy link
Contributor

@nodejs-github-bot nodejs-github-bot commented Aug 17, 2021

@nschonni
Copy link
Contributor

Odd, it's still picking up the previous commit

@nschonni
Copy link
Contributor

Ah, the generator is getting to commit for the dockerfile, rather than the folder that include the script file + Dockerfile

@nschonni
Copy link
Contributor

OK, think I found the issue, and nodejs/docker-node#1546 should pick up the folder commit hash, instead of the one only on the Dockerfile

@nodejs-github-bot nodejs-github-bot changed the title Node: fix: chmod bullseye entrypoint script Node: fix: Use folder commmit for Stackbrew Aug 17, 2021
@github-actions
Copy link

Diff for 922ae6c:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7c2ee32..c4250b8 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -27,6 +27,16 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: a16a841095bcefefaf0ec43ba39f91fc788b03d4
 Directory: 12/alpine3.14
 
+Tags: 12-bullseye, 12.22-bullseye, 12.22.5-bullseye, erbium-bullseye
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: ceafcc63d4dd5e03d8ab111639edf1ec7fcd45b6
+Directory: 12/bullseye
+
+Tags: 12-bullseye-slim, 12.22-bullseye-slim, 12.22.5-bullseye-slim, erbium-bullseye-slim
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: ceafcc63d4dd5e03d8ab111639edf1ec7fcd45b6
+Directory: 12/bullseye-slim
+
 Tags: 12-buster, 12.22-buster, 12.22.5-buster, erbium-buster
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: a16a841095bcefefaf0ec43ba39f91fc788b03d4
@@ -67,6 +77,16 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: a16a841095bcefefaf0ec43ba39f91fc788b03d4
 Directory: 14/alpine3.14
 
+Tags: 14-bullseye, 14.17-bullseye, 14.17.5-bullseye, fermium-bullseye, lts-bullseye
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: ceafcc63d4dd5e03d8ab111639edf1ec7fcd45b6
+Directory: 14/bullseye
+
+Tags: 14-bullseye-slim, 14.17-bullseye-slim, 14.17.5-bullseye-slim, fermium-bullseye-slim, lts-bullseye-slim
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: ceafcc63d4dd5e03d8ab111639edf1ec7fcd45b6
+Directory: 14/bullseye-slim
+
 Tags: 14-buster, 14.17-buster, 14.17.5-buster, fermium-buster, lts-buster
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: a16a841095bcefefaf0ec43ba39f91fc788b03d4
@@ -89,24 +109,34 @@ Directory: 16/buster
 
 Tags: 16-alpine, 16-alpine3.13, 16.6-alpine, 16.6-alpine3.13, 16.6.2-alpine, 16.6.2-alpine3.13, alpine, alpine3.13, current-alpine, current-alpine3.13
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a16a841095bcefefaf0ec43ba39f91fc788b03d4
+GitCommit: be6dead1eea26a9668413c3d0e2ec2bc90dc1eca
 Directory: 16/alpine3.13
 
 Tags: 16-alpine3.11, 16.6-alpine3.11, 16.6.2-alpine3.11, alpine3.11, current-alpine3.11
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a16a841095bcefefaf0ec43ba39f91fc788b03d4
+GitCommit: be6dead1eea26a9668413c3d0e2ec2bc90dc1eca
 Directory: 16/alpine3.11
 
 Tags: 16-alpine3.12, 16.6-alpine3.12, 16.6.2-alpine3.12, alpine3.12, current-alpine3.12
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a16a841095bcefefaf0ec43ba39f91fc788b03d4
+GitCommit: be6dead1eea26a9668413c3d0e2ec2bc90dc1eca
 Directory: 16/alpine3.12
 
 Tags: 16-alpine3.14, 16.6-alpine3.14, 16.6.2-alpine3.14, alpine3.14, current-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a16a841095bcefefaf0ec43ba39f91fc788b03d4
+GitCommit: be6dead1eea26a9668413c3d0e2ec2bc90dc1eca
 Directory: 16/alpine3.14
 
+Tags: 16-bullseye, 16.6-bullseye, 16.6.2-bullseye, bullseye, current-bullseye
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: ceafcc63d4dd5e03d8ab111639edf1ec7fcd45b6
+Directory: 16/bullseye
+
+Tags: 16-bullseye-slim, 16.6-bullseye-slim, 16.6.2-bullseye-slim, bullseye-slim, current-bullseye-slim
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: ceafcc63d4dd5e03d8ab111639edf1ec7fcd45b6
+Directory: 16/bullseye-slim
+
 Tags: 16-buster-slim, 16-slim, 16.6-buster-slim, 16.6-slim, 16.6.2-buster-slim, 16.6.2-slim, buster-slim, current-buster-slim, current-slim, slim
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: a16a841095bcefefaf0ec43ba39f91fc788b03d4
diff --git a/_bashbrew-list b/_bashbrew-list
index 67f74bf..7fd6684 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,6 +4,8 @@ node:12-alpine3.11
 node:12-alpine3.12
 node:12-alpine3.13
 node:12-alpine3.14
+node:12-bullseye
+node:12-bullseye-slim
 node:12-buster
 node:12-buster-slim
 node:12-slim
@@ -15,6 +17,8 @@ node:12.22-alpine3.11
 node:12.22-alpine3.12
 node:12.22-alpine3.13
 node:12.22-alpine3.14
+node:12.22-bullseye
+node:12.22-bullseye-slim
 node:12.22-buster
 node:12.22-buster-slim
 node:12.22-slim
@@ -26,6 +30,8 @@ node:12.22.5-alpine3.11
 node:12.22.5-alpine3.12
 node:12.22.5-alpine3.13
 node:12.22.5-alpine3.14
+node:12.22.5-bullseye
+node:12.22.5-bullseye-slim
 node:12.22.5-buster
 node:12.22.5-buster-slim
 node:12.22.5-slim
@@ -37,6 +43,8 @@ node:14-alpine3.11
 node:14-alpine3.12
 node:14-alpine3.13
 node:14-alpine3.14
+node:14-bullseye
+node:14-bullseye-slim
 node:14-buster
 node:14-buster-slim
 node:14-slim
@@ -48,6 +56,8 @@ node:14.17-alpine3.11
 node:14.17-alpine3.12
 node:14.17-alpine3.13
 node:14.17-alpine3.14
+node:14.17-bullseye
+node:14.17-bullseye-slim
 node:14.17-buster
 node:14.17-buster-slim
 node:14.17-slim
@@ -59,6 +69,8 @@ node:14.17.5-alpine3.11
 node:14.17.5-alpine3.12
 node:14.17.5-alpine3.13
 node:14.17.5-alpine3.14
+node:14.17.5-bullseye
+node:14.17.5-bullseye-slim
 node:14.17.5-buster
 node:14.17.5-buster-slim
 node:14.17.5-slim
@@ -70,6 +82,8 @@ node:16-alpine3.11
 node:16-alpine3.12
 node:16-alpine3.13
 node:16-alpine3.14
+node:16-bullseye
+node:16-bullseye-slim
 node:16-buster
 node:16-buster-slim
 node:16-slim
@@ -81,6 +95,8 @@ node:16.6-alpine3.11
 node:16.6-alpine3.12
 node:16.6-alpine3.13
 node:16.6-alpine3.14
+node:16.6-bullseye
+node:16.6-bullseye-slim
 node:16.6-buster
 node:16.6-buster-slim
 node:16.6-slim
@@ -92,6 +108,8 @@ node:16.6.2-alpine3.11
 node:16.6.2-alpine3.12
 node:16.6.2-alpine3.13
 node:16.6.2-alpine3.14
+node:16.6.2-bullseye
+node:16.6.2-bullseye-slim
 node:16.6.2-buster
 node:16.6.2-buster-slim
 node:16.6.2-slim
@@ -102,6 +120,8 @@ node:alpine3.11
 node:alpine3.12
 node:alpine3.13
 node:alpine3.14
+node:bullseye
+node:bullseye-slim
 node:buster
 node:buster-slim
 node:current
@@ -110,6 +130,8 @@ node:current-alpine3.11
 node:current-alpine3.12
 node:current-alpine3.13
 node:current-alpine3.14
+node:current-bullseye
+node:current-bullseye-slim
 node:current-buster
 node:current-buster-slim
 node:current-slim
@@ -121,6 +143,8 @@ node:erbium-alpine3.11
 node:erbium-alpine3.12
 node:erbium-alpine3.13
 node:erbium-alpine3.14
+node:erbium-bullseye
+node:erbium-bullseye-slim
 node:erbium-buster
 node:erbium-buster-slim
 node:erbium-slim
@@ -132,6 +156,8 @@ node:fermium-alpine3.11
 node:fermium-alpine3.12
 node:fermium-alpine3.13
 node:fermium-alpine3.14
+node:fermium-bullseye
+node:fermium-bullseye-slim
 node:fermium-buster
 node:fermium-buster-slim
 node:fermium-slim
@@ -144,6 +170,8 @@ node:lts-alpine3.11
 node:lts-alpine3.12
 node:lts-alpine3.13
 node:lts-alpine3.14
+node:lts-bullseye
+node:lts-bullseye-slim
 node:lts-buster
 node:lts-buster-slim
 node:lts-fermium
diff --git a/node_current-alpine3.11/Dockerfile b/node_current-alpine3.11/Dockerfile
index 8a8838b..5feb28f 100644
--- a/node_current-alpine3.11/Dockerfile
+++ b/node_current-alpine3.11/Dockerfile
@@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
       && case "${alpineArch##*-}" in \
         x86_64) \
           ARCH='x64' \
-          CHECKSUM="76e5c03480f4473049ab8ac9f986b8d4b8fd98ad69a8fe543a9af34cff320faa" \
+          CHECKSUM="f77b8782059a4f614e8cd0437e7b4761039f93410388fe1d1f9c072de69e98de" \
           ;; \
         *) ;; \
       esac \
diff --git a/node_current-alpine3.12/Dockerfile b/node_current-alpine3.12/Dockerfile
index b1355eb..d03c160 100644
--- a/node_current-alpine3.12/Dockerfile
+++ b/node_current-alpine3.12/Dockerfile
@@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
       && case "${alpineArch##*-}" in \
         x86_64) \
           ARCH='x64' \
-          CHECKSUM="76e5c03480f4473049ab8ac9f986b8d4b8fd98ad69a8fe543a9af34cff320faa" \
+          CHECKSUM="f77b8782059a4f614e8cd0437e7b4761039f93410388fe1d1f9c072de69e98de" \
           ;; \
         *) ;; \
       esac \
diff --git a/node_current-alpine3.13/Dockerfile b/node_current-alpine3.13/Dockerfile
index dd40e14..06c7caa 100644
--- a/node_current-alpine3.13/Dockerfile
+++ b/node_current-alpine3.13/Dockerfile
@@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
       && case "${alpineArch##*-}" in \
         x86_64) \
           ARCH='x64' \
-          CHECKSUM="76e5c03480f4473049ab8ac9f986b8d4b8fd98ad69a8fe543a9af34cff320faa" \
+          CHECKSUM="f77b8782059a4f614e8cd0437e7b4761039f93410388fe1d1f9c072de69e98de" \
           ;; \
         *) ;; \
       esac \
diff --git a/node_current-alpine3.14/Dockerfile b/node_current-alpine3.14/Dockerfile
index a698cf5..7c57b2d 100644
--- a/node_current-alpine3.14/Dockerfile
+++ b/node_current-alpine3.14/Dockerfile
@@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
       && case "${alpineArch##*-}" in \
         x86_64) \
           ARCH='x64' \
-          CHECKSUM="76e5c03480f4473049ab8ac9f986b8d4b8fd98ad69a8fe543a9af34cff320faa" \
+          CHECKSUM="f77b8782059a4f614e8cd0437e7b4761039f93410388fe1d1f9c072de69e98de" \
           ;; \
         *) ;; \
       esac \
diff --git a/node_slim/Dockerfile b/node_current-bullseye-slim/Dockerfile
similarity index 99%
copy from node_slim/Dockerfile
copy to node_current-bullseye-slim/Dockerfile
index ebef000..5ec0d10 100644
--- a/node_slim/Dockerfile
+++ b/node_current-bullseye-slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git a/node_current-alpine3.11/docker-entrypoint.sh b/node_current-bullseye-slim/docker-entrypoint.sh
similarity index 100%
copy from node_current-alpine3.11/docker-entrypoint.sh
copy to node_current-bullseye-slim/docker-entrypoint.sh
diff --git a/node_stretch/Dockerfile b/node_current-bullseye/Dockerfile
similarity index 99%
copy from node_stretch/Dockerfile
copy to node_current-bullseye/Dockerfile
index 731a91d..2b39d6c 100644
--- a/node_stretch/Dockerfile
+++ b/node_current-bullseye/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:stretch
+FROM buildpack-deps:bullseye
 
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git a/node_current-alpine3.11/docker-entrypoint.sh b/node_current-bullseye/docker-entrypoint.sh
similarity index 100%
copy from node_current-alpine3.11/docker-entrypoint.sh
copy to node_current-bullseye/docker-entrypoint.sh
diff --git a/node_erbium-buster-slim/Dockerfile b/node_erbium-bullseye-slim/Dockerfile
similarity index 99%
copy from node_erbium-buster-slim/Dockerfile
copy to node_erbium-bullseye-slim/Dockerfile
index 4fe5a0e..381e7b3 100644
--- a/node_erbium-buster-slim/Dockerfile
+++ b/node_erbium-bullseye-slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git a/node_current-alpine3.11/docker-entrypoint.sh b/node_erbium-bullseye-slim/docker-entrypoint.sh
similarity index 100%
copy from node_current-alpine3.11/docker-entrypoint.sh
copy to node_erbium-bullseye-slim/docker-entrypoint.sh
diff --git a/node_erbium-buster/Dockerfile b/node_erbium-bullseye/Dockerfile
similarity index 99%
copy from node_erbium-buster/Dockerfile
copy to node_erbium-bullseye/Dockerfile
index 02084c2..3d3725e 100644
--- a/node_erbium-buster/Dockerfile
+++ b/node_erbium-bullseye/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:buster
+FROM buildpack-deps:bullseye
 
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git a/node_current-alpine3.11/docker-entrypoint.sh b/node_erbium-bullseye/docker-entrypoint.sh
similarity index 100%
copy from node_current-alpine3.11/docker-entrypoint.sh
copy to node_erbium-bullseye/docker-entrypoint.sh
diff --git a/node_lts-buster-slim/Dockerfile b/node_lts-bullseye-slim/Dockerfile
similarity index 99%
copy from node_lts-buster-slim/Dockerfile
copy to node_lts-bullseye-slim/Dockerfile
index e7303b2..1bead7a 100644
--- a/node_lts-buster-slim/Dockerfile
+++ b/node_lts-bullseye-slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git a/node_current-alpine3.11/docker-entrypoint.sh b/node_lts-bullseye-slim/docker-entrypoint.sh
similarity index 100%
copy from node_current-alpine3.11/docker-entrypoint.sh
copy to node_lts-bullseye-slim/docker-entrypoint.sh
diff --git a/node_lts-buster/Dockerfile b/node_lts-bullseye/Dockerfile
similarity index 99%
copy from node_lts-buster/Dockerfile
copy to node_lts-bullseye/Dockerfile
index dacc62e..eed834b 100644
--- a/node_lts-buster/Dockerfile
+++ b/node_lts-bullseye/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:buster
+FROM buildpack-deps:bullseye
 
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git a/node_current-alpine3.11/docker-entrypoint.sh b/node_lts-bullseye/docker-entrypoint.sh
similarity index 100%
copy from node_current-alpine3.11/docker-entrypoint.sh
copy to node_lts-bullseye/docker-entrypoint.sh

@nschonni
Copy link
Contributor

@tianon looks like it worked now

@tianon tianon merged commit a256e49 into docker-library:master Aug 17, 2021
@nschonni nschonni deleted the node branch August 17, 2021 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants