From aa7519b72a2651071bc31385c693b56b969b4001 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Fri, 1 May 2020 18:50:05 +0000 Subject: [PATCH 1/4] Update node to 14 Signed-off-by: Reece Dunham --- release/lts/alpine38/dependabot/Dockerfile | 2 +- release/lts/alpine38/test-deps/docker/Dockerfile | 6 +++--- release/lts/alpine39/test-deps/docker/Dockerfile | 6 +++--- release/preview/alpine311/test-deps/docker/Dockerfile | 6 +++--- release/preview/alpine38/dependabot/Dockerfile | 2 +- release/preview/alpine38/test-deps/docker/Dockerfile | 6 +++--- release/preview/alpine39/test-deps/docker/Dockerfile | 6 +++--- release/stable/alpine38/dependabot/Dockerfile | 2 +- release/stable/alpine38/test-deps/docker/Dockerfile | 6 +++--- release/stable/alpine39/test-deps/docker/Dockerfile | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/release/lts/alpine38/dependabot/Dockerfile b/release/lts/alpine38/dependabot/Dockerfile index 1c8c3ded3..c173203ba 100644 --- a/release/lts/alpine38/dependabot/Dockerfile +++ b/release/lts/alpine38/dependabot/Dockerfile @@ -1 +1 @@ -FROM node:10.15.3-alpine +FROM node:14.0.0-alpine diff --git a/release/lts/alpine38/test-deps/docker/Dockerfile b/release/lts/alpine38/test-deps/docker/Dockerfile index 475dbfdea..0d6226a86 100644 --- a/release/lts/alpine38/test-deps/docker/Dockerfile +++ b/release/lts/alpine38/test-deps/docker/Dockerfile @@ -2,14 +2,14 @@ ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.8 -FROM node:10.15.3-alpine as node +FROM node:14.0.0-alpine as node # Do nothing, just added to borrow the already built node files. FROM ${BaseImage} -ENV NODE_VERSION=10.15.3 \ - YARN_VERSION=1.13.0 \ +ENV NODE_VERSION=14.0.0 \ + YARN_VERSION=1.22.4 \ NVM_DIR="/root/.nvm" \ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.8 diff --git a/release/lts/alpine39/test-deps/docker/Dockerfile b/release/lts/alpine39/test-deps/docker/Dockerfile index 94637a9f1..dc85b862c 100644 --- a/release/lts/alpine39/test-deps/docker/Dockerfile +++ b/release/lts/alpine39/test-deps/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9 -FROM node:10.15.3-alpine as node +FROM node:14.0.0-alpine as node # Do nothing, just added to borrow the already built node files. @@ -10,8 +10,8 @@ FROM ${BaseImage} ARG fromTag=3.9 -ENV NODE_VERSION=10.15.3 \ - YARN_VERSION=1.13.0 \ +ENV NODE_VERSION=14.0.0 \ + YARN_VERSION=1.22.4 \ NVM_DIR="/root/.nvm" \ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag} diff --git a/release/preview/alpine311/test-deps/docker/Dockerfile b/release/preview/alpine311/test-deps/docker/Dockerfile index c691ccfc9..c5eb0ec2d 100644 --- a/release/preview/alpine311/test-deps/docker/Dockerfile +++ b/release/preview/alpine311/test-deps/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.11 -FROM node:10.18.1-alpine as node +FROM node:14.0.0-alpine as node # Do nothing, just added to borrow the already built node files. @@ -10,8 +10,8 @@ FROM ${BaseImage} ARG fromTag=3.11 -ENV NODE_VERSION=10.18.1 \ - YARN_VERSION=1.21.1 \ +ENV NODE_VERSION=14.0.0 \ + YARN_VERSION=1.22.4 \ NVM_DIR="/root/.nvm" \ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag} diff --git a/release/preview/alpine38/dependabot/Dockerfile b/release/preview/alpine38/dependabot/Dockerfile index 1c8c3ded3..c173203ba 100644 --- a/release/preview/alpine38/dependabot/Dockerfile +++ b/release/preview/alpine38/dependabot/Dockerfile @@ -1 +1 @@ -FROM node:10.15.3-alpine +FROM node:14.0.0-alpine diff --git a/release/preview/alpine38/test-deps/docker/Dockerfile b/release/preview/alpine38/test-deps/docker/Dockerfile index dfa8be0b3..0d6226a86 100644 --- a/release/preview/alpine38/test-deps/docker/Dockerfile +++ b/release/preview/alpine38/test-deps/docker/Dockerfile @@ -2,14 +2,14 @@ ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.8 -FROM node:10.18.1-alpine as node +FROM node:14.0.0-alpine as node # Do nothing, just added to borrow the already built node files. FROM ${BaseImage} -ENV NODE_VERSION=10.18.1 \ - YARN_VERSION=1.21.1 \ +ENV NODE_VERSION=14.0.0 \ + YARN_VERSION=1.22.4 \ NVM_DIR="/root/.nvm" \ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.8 diff --git a/release/preview/alpine39/test-deps/docker/Dockerfile b/release/preview/alpine39/test-deps/docker/Dockerfile index bdbc6185a..dc85b862c 100644 --- a/release/preview/alpine39/test-deps/docker/Dockerfile +++ b/release/preview/alpine39/test-deps/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9 -FROM node:10.18.1-alpine as node +FROM node:14.0.0-alpine as node # Do nothing, just added to borrow the already built node files. @@ -10,8 +10,8 @@ FROM ${BaseImage} ARG fromTag=3.9 -ENV NODE_VERSION=10.18.1 \ - YARN_VERSION=1.21.1 \ +ENV NODE_VERSION=14.0.0 \ + YARN_VERSION=1.22.4 \ NVM_DIR="/root/.nvm" \ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag} diff --git a/release/stable/alpine38/dependabot/Dockerfile b/release/stable/alpine38/dependabot/Dockerfile index 1c8c3ded3..c173203ba 100644 --- a/release/stable/alpine38/dependabot/Dockerfile +++ b/release/stable/alpine38/dependabot/Dockerfile @@ -1 +1 @@ -FROM node:10.15.3-alpine +FROM node:14.0.0-alpine diff --git a/release/stable/alpine38/test-deps/docker/Dockerfile b/release/stable/alpine38/test-deps/docker/Dockerfile index 475dbfdea..0d6226a86 100644 --- a/release/stable/alpine38/test-deps/docker/Dockerfile +++ b/release/stable/alpine38/test-deps/docker/Dockerfile @@ -2,14 +2,14 @@ ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.8 -FROM node:10.15.3-alpine as node +FROM node:14.0.0-alpine as node # Do nothing, just added to borrow the already built node files. FROM ${BaseImage} -ENV NODE_VERSION=10.15.3 \ - YARN_VERSION=1.13.0 \ +ENV NODE_VERSION=14.0.0 \ + YARN_VERSION=1.22.4 \ NVM_DIR="/root/.nvm" \ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.8 diff --git a/release/stable/alpine39/test-deps/docker/Dockerfile b/release/stable/alpine39/test-deps/docker/Dockerfile index 94637a9f1..dc85b862c 100644 --- a/release/stable/alpine39/test-deps/docker/Dockerfile +++ b/release/stable/alpine39/test-deps/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9 -FROM node:10.15.3-alpine as node +FROM node:14.0.0-alpine as node # Do nothing, just added to borrow the already built node files. @@ -10,8 +10,8 @@ FROM ${BaseImage} ARG fromTag=3.9 -ENV NODE_VERSION=10.15.3 \ - YARN_VERSION=1.13.0 \ +ENV NODE_VERSION=14.0.0 \ + YARN_VERSION=1.22.4 \ NVM_DIR="/root/.nvm" \ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag} From 589df39f9b4c9fc1c98b8b1601bf5180b8213324 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Thu, 21 May 2020 14:51:06 +0000 Subject: [PATCH 2/4] Fix: 14.3.0 --- release/lts/alpine38/dependabot/Dockerfile | 2 +- release/lts/alpine38/test-deps/docker/Dockerfile | 2 +- release/lts/alpine39/test-deps/docker/Dockerfile | 4 ++-- release/preview/alpine311/test-deps/docker/Dockerfile | 4 ++-- release/preview/alpine38/dependabot/Dockerfile | 2 +- release/preview/alpine38/test-deps/docker/Dockerfile | 4 ++-- release/preview/alpine39/test-deps/docker/Dockerfile | 4 ++-- release/stable/alpine38/dependabot/Dockerfile | 2 +- release/stable/alpine38/test-deps/docker/Dockerfile | 4 ++-- release/stable/alpine39/test-deps/docker/Dockerfile | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/release/lts/alpine38/dependabot/Dockerfile b/release/lts/alpine38/dependabot/Dockerfile index c173203ba..e942d14d9 100644 --- a/release/lts/alpine38/dependabot/Dockerfile +++ b/release/lts/alpine38/dependabot/Dockerfile @@ -1 +1 @@ -FROM node:14.0.0-alpine +FROM node:14.3.0-alpine diff --git a/release/lts/alpine38/test-deps/docker/Dockerfile b/release/lts/alpine38/test-deps/docker/Dockerfile index 0d6226a86..df83e1f54 100644 --- a/release/lts/alpine38/test-deps/docker/Dockerfile +++ b/release/lts/alpine38/test-deps/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.8 -FROM node:14.0.0-alpine as node +FROM node:14.3.0-alpine as node # Do nothing, just added to borrow the already built node files. diff --git a/release/lts/alpine39/test-deps/docker/Dockerfile b/release/lts/alpine39/test-deps/docker/Dockerfile index dc85b862c..b6bd3bf89 100644 --- a/release/lts/alpine39/test-deps/docker/Dockerfile +++ b/release/lts/alpine39/test-deps/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9 -FROM node:14.0.0-alpine as node +FROM node:14.3.0-alpine as node # Do nothing, just added to borrow the already built node files. @@ -10,7 +10,7 @@ FROM ${BaseImage} ARG fromTag=3.9 -ENV NODE_VERSION=14.0.0 \ +ENV NODE_VERSION=14.3.0 \ YARN_VERSION=1.22.4 \ NVM_DIR="/root/.nvm" \ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag} diff --git a/release/preview/alpine311/test-deps/docker/Dockerfile b/release/preview/alpine311/test-deps/docker/Dockerfile index c5eb0ec2d..0ecc05f6a 100644 --- a/release/preview/alpine311/test-deps/docker/Dockerfile +++ b/release/preview/alpine311/test-deps/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.11 -FROM node:14.0.0-alpine as node +FROM node:14.3.0-alpine as node # Do nothing, just added to borrow the already built node files. @@ -10,7 +10,7 @@ FROM ${BaseImage} ARG fromTag=3.11 -ENV NODE_VERSION=14.0.0 \ +ENV NODE_VERSION=14.3.0 \ YARN_VERSION=1.22.4 \ NVM_DIR="/root/.nvm" \ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag} diff --git a/release/preview/alpine38/dependabot/Dockerfile b/release/preview/alpine38/dependabot/Dockerfile index c173203ba..e942d14d9 100644 --- a/release/preview/alpine38/dependabot/Dockerfile +++ b/release/preview/alpine38/dependabot/Dockerfile @@ -1 +1 @@ -FROM node:14.0.0-alpine +FROM node:14.3.0-alpine diff --git a/release/preview/alpine38/test-deps/docker/Dockerfile b/release/preview/alpine38/test-deps/docker/Dockerfile index 0d6226a86..4b38aafe0 100644 --- a/release/preview/alpine38/test-deps/docker/Dockerfile +++ b/release/preview/alpine38/test-deps/docker/Dockerfile @@ -2,13 +2,13 @@ ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.8 -FROM node:14.0.0-alpine as node +FROM node:14.3.0-alpine as node # Do nothing, just added to borrow the already built node files. FROM ${BaseImage} -ENV NODE_VERSION=14.0.0 \ +ENV NODE_VERSION=14.3.0 \ YARN_VERSION=1.22.4 \ NVM_DIR="/root/.nvm" \ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.8 diff --git a/release/preview/alpine39/test-deps/docker/Dockerfile b/release/preview/alpine39/test-deps/docker/Dockerfile index dc85b862c..b6bd3bf89 100644 --- a/release/preview/alpine39/test-deps/docker/Dockerfile +++ b/release/preview/alpine39/test-deps/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9 -FROM node:14.0.0-alpine as node +FROM node:14.3.0-alpine as node # Do nothing, just added to borrow the already built node files. @@ -10,7 +10,7 @@ FROM ${BaseImage} ARG fromTag=3.9 -ENV NODE_VERSION=14.0.0 \ +ENV NODE_VERSION=14.3.0 \ YARN_VERSION=1.22.4 \ NVM_DIR="/root/.nvm" \ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag} diff --git a/release/stable/alpine38/dependabot/Dockerfile b/release/stable/alpine38/dependabot/Dockerfile index c173203ba..e942d14d9 100644 --- a/release/stable/alpine38/dependabot/Dockerfile +++ b/release/stable/alpine38/dependabot/Dockerfile @@ -1 +1 @@ -FROM node:14.0.0-alpine +FROM node:14.3.0-alpine diff --git a/release/stable/alpine38/test-deps/docker/Dockerfile b/release/stable/alpine38/test-deps/docker/Dockerfile index 0d6226a86..4b38aafe0 100644 --- a/release/stable/alpine38/test-deps/docker/Dockerfile +++ b/release/stable/alpine38/test-deps/docker/Dockerfile @@ -2,13 +2,13 @@ ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.8 -FROM node:14.0.0-alpine as node +FROM node:14.3.0-alpine as node # Do nothing, just added to borrow the already built node files. FROM ${BaseImage} -ENV NODE_VERSION=14.0.0 \ +ENV NODE_VERSION=14.3.0 \ YARN_VERSION=1.22.4 \ NVM_DIR="/root/.nvm" \ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.8 diff --git a/release/stable/alpine39/test-deps/docker/Dockerfile b/release/stable/alpine39/test-deps/docker/Dockerfile index dc85b862c..b6bd3bf89 100644 --- a/release/stable/alpine39/test-deps/docker/Dockerfile +++ b/release/stable/alpine39/test-deps/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9 -FROM node:14.0.0-alpine as node +FROM node:14.3.0-alpine as node # Do nothing, just added to borrow the already built node files. @@ -10,7 +10,7 @@ FROM ${BaseImage} ARG fromTag=3.9 -ENV NODE_VERSION=14.0.0 \ +ENV NODE_VERSION=14.3.0 \ YARN_VERSION=1.22.4 \ NVM_DIR="/root/.nvm" \ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag} From 8c56e1596ca39b4aed837f1f5271abceb4c97881 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Thu, 21 May 2020 15:19:33 +0000 Subject: [PATCH 3/4] Bump up max sizes Signed-off-by: Reece Dunham --- release/lts/alpine38/test-deps/meta.json | 2 +- release/lts/alpine39/test-deps/meta.json | 2 +- release/preview/alpine311/test-deps/meta.json | 2 +- release/preview/alpine39/test-deps/meta.json | 2 +- release/stable/alpine38/test-deps/meta.json | 2 +- release/stable/alpine39/test-deps/meta.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/release/lts/alpine38/test-deps/meta.json b/release/lts/alpine38/test-deps/meta.json index 9ac39a65b..b4f07326c 100644 --- a/release/lts/alpine38/test-deps/meta.json +++ b/release/lts/alpine38/test-deps/meta.json @@ -11,6 +11,6 @@ "test-deps-musl" ], "TestProperties": { - "size": 212 + "size": 254 } } diff --git a/release/lts/alpine39/test-deps/meta.json b/release/lts/alpine39/test-deps/meta.json index 5dec6e953..712f66eba 100644 --- a/release/lts/alpine39/test-deps/meta.json +++ b/release/lts/alpine39/test-deps/meta.json @@ -11,7 +11,7 @@ "test-deps-musl" ], "TestProperties": { - "size": 212 + "size": 254 }, "TagMapping": { "^.*-alpine-3.9$" : "lts-alpine-3.9", diff --git a/release/preview/alpine311/test-deps/meta.json b/release/preview/alpine311/test-deps/meta.json index ac78bc6dd..fe14f3c82 100644 --- a/release/preview/alpine311/test-deps/meta.json +++ b/release/preview/alpine311/test-deps/meta.json @@ -11,7 +11,7 @@ "test-deps-musl" ], "TestProperties": { - "size": 263 + "size": 295 }, "TagMapping": { "^.*-alpine-3.11$" : "preview-alpine-3.11" diff --git a/release/preview/alpine39/test-deps/meta.json b/release/preview/alpine39/test-deps/meta.json index a4fdb1d17..3d4f95d93 100644 --- a/release/preview/alpine39/test-deps/meta.json +++ b/release/preview/alpine39/test-deps/meta.json @@ -11,7 +11,7 @@ "test-deps-musl" ], "TestProperties": { - "size": 263 + "size": 296 }, "TagMapping": { "^.*-alpine-3.9$" : "preview-alpine-3.9", diff --git a/release/stable/alpine38/test-deps/meta.json b/release/stable/alpine38/test-deps/meta.json index 7ea9f4cbd..267ad884c 100644 --- a/release/stable/alpine38/test-deps/meta.json +++ b/release/stable/alpine38/test-deps/meta.json @@ -11,6 +11,6 @@ "test-deps-musl" ], "TestProperties": { - "size": 212 + "size": 255 } } diff --git a/release/stable/alpine39/test-deps/meta.json b/release/stable/alpine39/test-deps/meta.json index 7af6a0869..b8897cdc8 100644 --- a/release/stable/alpine39/test-deps/meta.json +++ b/release/stable/alpine39/test-deps/meta.json @@ -11,7 +11,7 @@ "test-deps-musl" ], "TestProperties": { - "size": 212 + "size": 255 }, "TagMapping": { "^.*-alpine-3.9$" : "alpine-3.9", From 4d06f4f362306a505067d53e5c62f6666e050a17 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Thu, 21 May 2020 11:59:50 -0400 Subject: [PATCH 4/4] Update meta.json --- release/preview/alpine38/test-deps/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/preview/alpine38/test-deps/meta.json b/release/preview/alpine38/test-deps/meta.json index 43d618fd3..8c220b258 100644 --- a/release/preview/alpine38/test-deps/meta.json +++ b/release/preview/alpine38/test-deps/meta.json @@ -11,6 +11,6 @@ "test-deps-musl" ], "TestProperties": { - "size": 264 + "size": 297 } }