Node: fix: use most Current/LTS with overlapping dates #12266
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 tasks
nodejs-github-bot
changed the title
Diff for 937e018:diff --git a/_bashbrew-cat b/_bashbrew-cat
index fe60e14..936dd47 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -122,42 +122,72 @@ Architectures: amd64, arm32v7, arm64v8
GitCommit: 6e8f32de3f620833e563e9f2b427d50055783801
Directory: 16/stretch-slim
-Tags: 17, 17-bullseye, 17.9, 17.9-bullseye, 17.9.0, 17.9.0-bullseye, bullseye, current, current-bullseye, latest
+Tags: 17, 17-bullseye, 17.9, 17.9-bullseye, 17.9.0, 17.9.0-bullseye
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
GitCommit: 2b855be09ac7e83326147026241f42cc02830b04
Directory: 17/bullseye
-Tags: 17-alpine, 17-alpine3.15, 17.9-alpine, 17.9-alpine3.15, 17.9.0-alpine, 17.9.0-alpine3.15, alpine, alpine3.15, current-alpine, current-alpine3.15
+Tags: 17-alpine, 17-alpine3.15, 17.9-alpine, 17.9-alpine3.15, 17.9.0-alpine, 17.9.0-alpine3.15
Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
GitCommit: 2b855be09ac7e83326147026241f42cc02830b04
Directory: 17/alpine3.15
-Tags: 17-alpine3.14, 17.9-alpine3.14, 17.9.0-alpine3.14, alpine3.14, current-alpine3.14
+Tags: 17-alpine3.14, 17.9-alpine3.14, 17.9.0-alpine3.14
Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
GitCommit: 2b855be09ac7e83326147026241f42cc02830b04
Directory: 17/alpine3.14
-Tags: 17-bullseye-slim, 17-slim, 17.9-bullseye-slim, 17.9-slim, 17.9.0-bullseye-slim, 17.9.0-slim, bullseye-slim, current-bullseye-slim, current-slim, slim
+Tags: 17-bullseye-slim, 17-slim, 17.9-bullseye-slim, 17.9-slim, 17.9.0-bullseye-slim, 17.9.0-slim
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
GitCommit: 2b855be09ac7e83326147026241f42cc02830b04
Directory: 17/bullseye-slim
-Tags: 17-buster, 17.9-buster, 17.9.0-buster, buster, current-buster
+Tags: 17-buster, 17.9-buster, 17.9.0-buster
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
GitCommit: 2b855be09ac7e83326147026241f42cc02830b04
Directory: 17/buster
-Tags: 17-buster-slim, 17.9-buster-slim, 17.9.0-buster-slim, buster-slim, current-buster-slim
+Tags: 17-buster-slim, 17.9-buster-slim, 17.9.0-buster-slim
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
GitCommit: 2b855be09ac7e83326147026241f42cc02830b04
Directory: 17/buster-slim
-Tags: 17-stretch, 17.9-stretch, 17.9.0-stretch, current-stretch, stretch
+Tags: 17-stretch, 17.9-stretch, 17.9.0-stretch
Architectures: amd64, arm32v7, arm64v8
GitCommit: 2b855be09ac7e83326147026241f42cc02830b04
Directory: 17/stretch
-Tags: 17-stretch-slim, 17.9-stretch-slim, 17.9.0-stretch-slim, current-stretch-slim, stretch-slim
+Tags: 17-stretch-slim, 17.9-stretch-slim, 17.9.0-stretch-slim
Architectures: amd64, arm32v7, arm64v8
GitCommit: 2b855be09ac7e83326147026241f42cc02830b04
Directory: 17/stretch-slim
+
+Tags: 18, 18-bullseye, 18.0, 18.0-bullseye, 18.0.0, 18.0.0-bullseye, bullseye, current, current-bullseye, latest
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 2b67149d782e4716b9c51f348b401e9d07940831
+Directory: 18/bullseye
+
+Tags: 18-alpine, 18-alpine3.15, 18.0-alpine, 18.0-alpine3.15, 18.0.0-alpine, 18.0.0-alpine3.15, alpine, alpine3.15, current-alpine, current-alpine3.15
+Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 2b67149d782e4716b9c51f348b401e9d07940831
+Directory: 18/alpine3.15
+
+Tags: 18-alpine3.14, 18.0-alpine3.14, 18.0.0-alpine3.14, alpine3.14, current-alpine3.14
+Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 2b67149d782e4716b9c51f348b401e9d07940831
+Directory: 18/alpine3.14
+
+Tags: 18-bullseye-slim, 18-slim, 18.0-bullseye-slim, 18.0-slim, 18.0.0-bullseye-slim, 18.0.0-slim, bullseye-slim, current-bullseye-slim, current-slim, slim
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 2b67149d782e4716b9c51f348b401e9d07940831
+Directory: 18/bullseye-slim
+
+Tags: 18-buster, 18.0-buster, 18.0.0-buster, buster, current-buster
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 2b67149d782e4716b9c51f348b401e9d07940831
+Directory: 18/buster
+
+Tags: 18-buster-slim, 18.0-buster-slim, 18.0.0-buster-slim, buster-slim, current-buster-slim
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 2b67149d782e4716b9c51f348b401e9d07940831
+Directory: 18/buster-slim
diff --git a/_bashbrew-list b/_bashbrew-list
index 15312d3..d196971 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -130,6 +130,33 @@ node:17.9.0-buster-slim
node:17.9.0-slim
node:17.9.0-stretch
node:17.9.0-stretch-slim
+node:18
+node:18-alpine
+node:18-alpine3.14
+node:18-alpine3.15
+node:18-bullseye
+node:18-bullseye-slim
+node:18-buster
+node:18-buster-slim
+node:18-slim
+node:18.0
+node:18.0-alpine
+node:18.0-alpine3.14
+node:18.0-alpine3.15
+node:18.0-bullseye
+node:18.0-bullseye-slim
+node:18.0-buster
+node:18.0-buster-slim
+node:18.0-slim
+node:18.0.0
+node:18.0.0-alpine
+node:18.0.0-alpine3.14
+node:18.0.0-alpine3.15
+node:18.0.0-bullseye
+node:18.0.0-bullseye-slim
+node:18.0.0-buster
+node:18.0.0-buster-slim
+node:18.0.0-slim
node:alpine
node:alpine3.14
node:alpine3.15
@@ -146,8 +173,6 @@ node:current-bullseye-slim
node:current-buster
node:current-buster-slim
node:current-slim
-node:current-stretch
-node:current-stretch-slim
node:erbium
node:erbium-alpine
node:erbium-alpine3.14
@@ -195,5 +220,3 @@ node:lts-slim
node:lts-stretch
node:lts-stretch-slim
node:slim
-node:stretch
-node:stretch-slim
diff --git a/node_current-alpine3.14/Dockerfile b/node_17.9.0-alpine3.14/Dockerfile
similarity index 100%
copy from node_current-alpine3.14/Dockerfile
copy to node_17.9.0-alpine3.14/Dockerfile
diff --git a/node_stretch-slim/docker-entrypoint.sh b/node_17.9.0-alpine3.14/docker-entrypoint.sh
similarity index 100%
rename from node_stretch-slim/docker-entrypoint.sh
rename to node_17.9.0-alpine3.14/docker-entrypoint.sh
diff --git a/node_current-alpine3.15/Dockerfile b/node_17.9.0-alpine3.15/Dockerfile
similarity index 100%
copy from node_current-alpine3.15/Dockerfile
copy to node_17.9.0-alpine3.15/Dockerfile
diff --git a/node_stretch/docker-entrypoint.sh b/node_17.9.0-alpine3.15/docker-entrypoint.sh
similarity index 100%
rename from node_stretch/docker-entrypoint.sh
rename to node_17.9.0-alpine3.15/docker-entrypoint.sh
diff --git a/node_latest/Dockerfile b/node_17.9.0-bullseye/Dockerfile
similarity index 100%
copy from node_latest/Dockerfile
copy to node_17.9.0-bullseye/Dockerfile
diff --git a/node_current-alpine3.14/docker-entrypoint.sh b/node_17.9.0-bullseye/docker-entrypoint.sh
similarity index 100%
copy from node_current-alpine3.14/docker-entrypoint.sh
copy to node_17.9.0-bullseye/docker-entrypoint.sh
diff --git a/node_current-buster-slim/Dockerfile b/node_17.9.0-buster-slim/Dockerfile
similarity index 100%
copy from node_current-buster-slim/Dockerfile
copy to node_17.9.0-buster-slim/Dockerfile
diff --git a/node_current-alpine3.14/docker-entrypoint.sh b/node_17.9.0-buster-slim/docker-entrypoint.sh
similarity index 100%
copy from node_current-alpine3.14/docker-entrypoint.sh
copy to node_17.9.0-buster-slim/docker-entrypoint.sh
diff --git a/node_current-buster/Dockerfile b/node_17.9.0-buster/Dockerfile
similarity index 100%
copy from node_current-buster/Dockerfile
copy to node_17.9.0-buster/Dockerfile
diff --git a/node_current-alpine3.14/docker-entrypoint.sh b/node_17.9.0-buster/docker-entrypoint.sh
similarity index 100%
copy from node_current-alpine3.14/docker-entrypoint.sh
copy to node_17.9.0-buster/docker-entrypoint.sh
diff --git a/node_slim/Dockerfile b/node_17.9.0-slim/Dockerfile
similarity index 100%
copy from node_slim/Dockerfile
copy to node_17.9.0-slim/Dockerfile
diff --git a/node_current-alpine3.14/docker-entrypoint.sh b/node_17.9.0-slim/docker-entrypoint.sh
similarity index 100%
copy from node_current-alpine3.14/docker-entrypoint.sh
copy to node_17.9.0-slim/docker-entrypoint.sh
diff --git a/node_stretch-slim/Dockerfile b/node_17.9.0-stretch-slim/Dockerfile
similarity index 100%
rename from node_stretch-slim/Dockerfile
rename to node_17.9.0-stretch-slim/Dockerfile
diff --git a/node_current-alpine3.14/docker-entrypoint.sh b/node_17.9.0-stretch-slim/docker-entrypoint.sh
similarity index 100%
copy from node_current-alpine3.14/docker-entrypoint.sh
copy to node_17.9.0-stretch-slim/docker-entrypoint.sh
diff --git a/node_stretch/Dockerfile b/node_17.9.0-stretch/Dockerfile
similarity index 100%
rename from node_stretch/Dockerfile
rename to node_17.9.0-stretch/Dockerfile
diff --git a/node_current-alpine3.14/docker-entrypoint.sh b/node_17.9.0-stretch/docker-entrypoint.sh
similarity index 100%
copy from node_current-alpine3.14/docker-entrypoint.sh
copy to node_17.9.0-stretch/docker-entrypoint.sh
diff --git a/node_current-alpine3.14/Dockerfile b/node_current-alpine3.14/Dockerfile
index 0bb9d35..620891f 100644
--- a/node_current-alpine3.14/Dockerfile
+++ b/node_current-alpine3.14/Dockerfile
@@ -1,6 +1,6 @@
FROM alpine:3.14
-ENV NODE_VERSION 17.9.0
+ENV NODE_VERSION 18.0.0
RUN addgroup -g 1000 node \
&& adduser -u 1000 -G node -s /bin/sh -D node \
@@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
&& case "${alpineArch##*-}" in \
x86_64) \
ARCH='x64' \
- CHECKSUM="8b4f38b239b342bef694ba41b82a127e94688be37cdda8a355b2d8307a0dcf20" \
+ CHECKSUM="64277af61876eb2460faf6fe4d127cd4cfaed7239f4fc8c8fa2afe05503aae38" \
;; \
*) ;; \
esac \
diff --git a/node_current-alpine3.15/Dockerfile b/node_current-alpine3.15/Dockerfile
index 75510fa..6c6d19e 100644
--- a/node_current-alpine3.15/Dockerfile
+++ b/node_current-alpine3.15/Dockerfile
@@ -1,6 +1,6 @@
FROM alpine:3.15
-ENV NODE_VERSION 17.9.0
+ENV NODE_VERSION 18.0.0
RUN addgroup -g 1000 node \
&& adduser -u 1000 -G node -s /bin/sh -D node \
@@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
&& case "${alpineArch##*-}" in \
x86_64) \
ARCH='x64' \
- CHECKSUM="8b4f38b239b342bef694ba41b82a127e94688be37cdda8a355b2d8307a0dcf20" \
+ CHECKSUM="64277af61876eb2460faf6fe4d127cd4cfaed7239f4fc8c8fa2afe05503aae38" \
;; \
*) ;; \
esac \
diff --git a/node_current-buster-slim/Dockerfile b/node_current-buster-slim/Dockerfile
index 90b9cbb..aefad7b 100644
--- a/node_current-buster-slim/Dockerfile
+++ b/node_current-buster-slim/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:buster-slim
RUN groupadd --gid 1000 node \
&& useradd --uid 1000 --gid node --shell /bin/bash --create-home node
-ENV NODE_VERSION 17.9.0
+ENV NODE_VERSION 18.0.0
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& case "${dpkgArch##*-}" in \
diff --git a/node_current-buster/Dockerfile b/node_current-buster/Dockerfile
index 34d3c71..c29a582 100644
--- a/node_current-buster/Dockerfile
+++ b/node_current-buster/Dockerfile
@@ -3,7 +3,7 @@ FROM buildpack-deps:buster
RUN groupadd --gid 1000 node \
&& useradd --uid 1000 --gid node --shell /bin/bash --create-home node
-ENV NODE_VERSION 17.9.0
+ENV NODE_VERSION 18.0.0
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& case "${dpkgArch##*-}" in \
diff --git a/node_latest/Dockerfile b/node_latest/Dockerfile
index 12bd999..0a9b6e9 100644
--- a/node_latest/Dockerfile
+++ b/node_latest/Dockerfile
@@ -3,7 +3,7 @@ FROM buildpack-deps:bullseye
RUN groupadd --gid 1000 node \
&& useradd --uid 1000 --gid node --shell /bin/bash --create-home node
-ENV NODE_VERSION 17.9.0
+ENV NODE_VERSION 18.0.0
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& case "${dpkgArch##*-}" in \
diff --git a/node_slim/Dockerfile b/node_slim/Dockerfile
index ee64089..48dd3ed 100644
--- a/node_slim/Dockerfile
+++ b/node_slim/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:bullseye-slim
RUN groupadd --gid 1000 node \
&& useradd --uid 1000 --gid node --shell /bin/bash --create-home node
-ENV NODE_VERSION 17.9.0
+ENV NODE_VERSION 18.0.0
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& case "${dpkgArch##*-}" in \Relevant Maintainers:
|
|
Note that this drops the |
2 tasks
|
Just an FYI that this build will be slow since the build queue is very full from the Debian update that was merged yesterday (#12257). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request: nodejs/docker-node#1698
@LaurentGoderre @PeterDaveHello @SimenB @Starefossen @nschonni @ttshivers