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.

Sign up for GitHub

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

Jump to bottom

feat: Node v13.11.0 and Yarn 1.22.4 #1229

Closed
wants to merge 2 commits into from
Closed

feat: Node v13.11.0 and Yarn 1.22.4 #1229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cbdbdc
feat: Node v13.11.0 and Yarn 1.22.4
nschonni Mar 12, 2020
a95e58c
fix: Remove default variant test
nschonni Mar 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions 13/alpine3.10/Dockerfile
View file
Open in desktop
@@ -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 \
Expand All @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
&& case "${alpineArch##*-}" in \
x86_64) \
ARCH='x64' \
CHECKSUM="b5b1af4f97bf8759e0de58e0d659ffa81db4857500e56e2b0b3f5948351a9bfa" \
CHECKSUM="3bbdfc77adc4682ac5d9907021494b37f365c3d7e3952b2efbc70d0512fad907" \
;; \
*) ;; \
esac \
Expand Down Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions 13/alpine3.11/Dockerfile
View file
Open in desktop
@@ -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 \
Expand All @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
&& case "${alpineArch##*-}" in \
x86_64) \
ARCH='x64' \
CHECKSUM="b5b1af4f97bf8759e0de58e0d659ffa81db4857500e56e2b0b3f5948351a9bfa" \
CHECKSUM="3bbdfc77adc4682ac5d9907021494b37f365c3d7e3952b2efbc70d0512fad907" \
;; \
*) ;; \
esac \
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions 13/buster-slim/Dockerfile
View file
Open in desktop
Expand Up @@ -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 \
Expand Down Expand Up @@ -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)" \
Expand Down
4 changes: 2 additions & 2 deletions 13/buster/Dockerfile
View file
Open in desktop
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions 13/stretch-slim/Dockerfile
View file
Open in desktop
Expand Up @@ -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 \
Expand Down Expand Up @@ -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)" \
Expand Down
4 changes: 2 additions & 2 deletions 13/stretch/Dockerfile
View file
Open in desktop
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 0 additions & 3 deletions test-build.sh
View file
Open in desktop
Expand Up @@ -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}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this fix for?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My Chakracore fix in the other PR was incorrect in removing just the if and leaving the contents. It should have removed these lines, so when I pushed the original PR, the build failed on the tests.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's actually a little clearer on my GH Actions PR #1194 where all the builds failed before doing the same fix

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's separate the fix to another PR, it has nothing to do with the version update itself.


# Get supported variants according to the target architecture.
# See details in function.sh
IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "${version}")" "${variant_arg[@]}")"
Expand Down