Skip to content

Commit 3286c0d

Browse files
LaurentGoderreLaurentGoderre
committed
temp
1 parent 598d844 commit 3286c0d

File tree

11 files changed

+63
-77
lines changed

11 files changed

+63
-77
lines changed

‎10/windows/nanoserver/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM microsoft/windowsservercore as download
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

5-
ENV NODE_VERSION 10.0.0
5+
ENV NODE_VERSION 10.1.0
66

77
ENV GPG_VERSION 2.3.4
88

@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
1111
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1212

1313
RUN @( \
14-
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
15-
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
16-
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
17-
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
18-
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
19-
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
20-
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
14+
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
15+
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
16+
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
17+
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
18+
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
19+
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
20+
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
2121
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
2222
) | foreach { \
2323
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
@@ -46,7 +46,7 @@ FROM microsoft/nanoserver
4646

4747
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
4848

49-
ENV NODE_VERSION 10.0.0
49+
ENV NODE_VERSION 10.1.0
5050

5151
COPY --from=download /nodejs /nodejs
5252
COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]

‎10/windows/windowsservercore/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM microsoft/windowsservercore as download
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

5-
ENV NODE_VERSION 10.0.0
5+
ENV NODE_VERSION 10.1.0
66

77
ENV GPG_VERSION 2.3.4
88

@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
1111
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1212

1313
RUN @( \
14-
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
15-
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
16-
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
17-
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
18-
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
19-
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
20-
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
14+
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
15+
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
16+
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
17+
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
18+
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
19+
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
20+
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
2121
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
2222
) | foreach { \
2323
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
@@ -46,7 +46,7 @@ FROM microsoft/windowsservercore
4646

4747
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
4848

49-
ENV NODE_VERSION 10.0.0
49+
ENV NODE_VERSION 10.1.0
5050

5151
COPY --from=download /nodejs /nodejs
5252
COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]

‎6/windows/nanoserver/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
1111
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1212

1313
RUN @( \
14-
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
15-
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
16-
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
17-
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
18-
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
19-
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
20-
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
14+
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
15+
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
16+
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
17+
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
18+
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
19+
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
20+
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
2121
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
2222
) | foreach { \
2323
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \

‎6/windows/windowsservercore/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
1111
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1212

1313
RUN @( \
14-
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
15-
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
16-
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
17-
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
18-
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
19-
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
20-
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
14+
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
15+
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
16+
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
17+
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
18+
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
19+
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
20+
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
2121
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
2222
) | foreach { \
2323
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \

‎8/windows/nanoserver/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
1111
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1212

1313
RUN @( \
14-
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
15-
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
16-
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
17-
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
18-
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
19-
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
20-
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
14+
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
15+
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
16+
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
17+
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
18+
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
19+
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
20+
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
2121
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
2222
) | foreach { \
2323
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \

‎8/windows/windowsservercore/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
1111
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1212

1313
RUN @( \
14-
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
15-
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
16-
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
17-
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
18-
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
19-
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
20-
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
14+
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
15+
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
16+
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
17+
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
18+
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
19+
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
20+
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
2121
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
2222
) | foreach { \
2323
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \

‎9/windows/nanoserver/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
1111
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1212

1313
RUN @( \
14-
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
15-
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
16-
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
17-
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
18-
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
19-
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
20-
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
14+
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
15+
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
16+
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
17+
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
18+
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
19+
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
20+
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
2121
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
2222
) | foreach { \
2323
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \

‎9/windows/windowsservercore/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
1111
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1212

1313
RUN @( \
14-
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
15-
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
16-
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
17-
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
18-
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
19-
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
20-
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
14+
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
15+
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
16+
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
17+
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
18+
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
19+
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
20+
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
2121
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
2222
) | foreach { \
2323
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \

‎Dockerfile-nanoserver.template

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,7 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
1111
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1212

1313
RUN @( \
14-
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
15-
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
16-
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
17-
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
18-
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
19-
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
20-
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
21-
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
14+
"${NODE_KEYS[@]}"
2215
) | foreach { \
2316
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
2417
} ; \

‎Dockerfile-windowsservercore.template

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,7 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
1111
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
1212

1313
RUN @( \
14-
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
15-
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
16-
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
17-
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
18-
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
19-
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
20-
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
21-
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
14+
"${NODE_KEYS[@]}"
2215
) | foreach { \
2316
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
2417
} ; \

‎update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function update_node_version {
5656
while read -r line
5757
do
5858
pattern="\"\\$\\{$(echo "$key_type" | tr '[:lower:]' '[:upper:]')_KEYS\\[@\\]\\}\""
59-
sed -E -i.bak -e "s/([ \\t]*)($pattern)/\\1${line}${new_line}\\1\\2/" "$dockerfile" && rm "$dockerfile".bak
59+
sed -E -i.bak -e "s/([ \\t]*)($pattern)/\\1'${line}',${new_line}\\1\\2/" "$dockerfile" && rm "$dockerfile".bak
6060
done < "keys/$key_type.keys"
6161
sed -E -i.bak "/$pattern/d" "$dockerfile" && rm "$dockerfile".bak
6262
done

0 commit comments

Comments
 (0)