From 9cbdbdcb5fa2764eec3b008a07f07aa109e2eb50 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 12 Mar 2020 00:54:02 -0400 Subject: [PATCH 1/2] feat: Node v13.11.0 and Yarn 1.22.4 --- 13/alpine3.10/Dockerfile | 6 +++--- 13/alpine3.11/Dockerfile | 6 +++--- 13/buster-slim/Dockerfile | 4 ++-- 13/buster/Dockerfile | 4 ++-- 13/stretch-slim/Dockerfile | 4 ++-- 13/stretch/Dockerfile | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile index 81ca97417a..d63a228ed0 100644 --- a/13/alpine3.10/Dockerfile +++ b/13/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.10.1 +ENV NODE_VERSION 13.11.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="b5b1af4f97bf8759e0de58e0d659ffa81db4857500e56e2b0b3f5948351a9bfa" \ + CHECKSUM="3bbdfc77adc4682ac5d9907021494b37f365c3d7e3952b2efbc70d0512fad907" \ ;; \ *) ;; \ esac \ @@ -72,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/13/alpine3.11/Dockerfile b/13/alpine3.11/Dockerfile index 406689ec23..4485f930f1 100644 --- a/13/alpine3.11/Dockerfile +++ b/13/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 13.10.1 +ENV NODE_VERSION 13.11.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="b5b1af4f97bf8759e0de58e0d659ffa81db4857500e56e2b0b3f5948351a9bfa" \ + CHECKSUM="3bbdfc77adc4682ac5d9907021494b37f365c3d7e3952b2efbc70d0512fad907" \ ;; \ *) ;; \ esac \ @@ -72,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index 64613e5855..a617b24211 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.10.1 +ENV NODE_VERSION 13.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -56,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index 07ea5974ca..4cb179436b 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.10.1 +ENV NODE_VERSION 13.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && for key in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index 8385820095..229febaab3 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/stretch-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:stretch-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 13.10.1 +ENV NODE_VERSION 13.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -56,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index f673eda727..1b09ba0599 100644 --- a/13/stretch/Dockerfile +++ b/13/stretch/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:stretch RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 13.10.1 +ENV NODE_VERSION 13.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && for key in \ From a95e58c38a4fa07f19cd55c07745b3eb3edeaad8 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 12 Mar 2020 01:06:35 -0400 Subject: [PATCH 2/2] fix: Remove default variant test --- test-build.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/test-build.sh b/test-build.sh index 4f18016c8c..6614725d35 100755 --- a/test-build.sh +++ b/test-build.sh @@ -74,9 +74,6 @@ for version in "${versions[@]}"; do tag=$(get_tag "${version}") full_version=$(get_full_version "${version}") - build "${version}" "default" "${tag}" - test_image "${full_version}" "default" "${tag}" - # Get supported variants according to the target architecture. # See details in function.sh IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "${version}")" "${variant_arg[@]}")"