Skip to content

Commit

Permalink
temp
Browse files Browse the repository at this point in the history
  • Loading branch information
@LaurentGoderre
LaurentGoderre committed May 9, 2018
1 parent 598d844 commit 4a05960
Show file tree
Hide file tree
Showing 11 changed files with 63 additions and 77 deletions.
18 changes: 9 additions & 9 deletions 10/windows/nanoserver/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM microsoft/windowsservercore as download

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

ENV NODE_VERSION 10.0.0
ENV NODE_VERSION 10.1.0

ENV GPG_VERSION 2.3.4

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

RUN @( \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
) | foreach { \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
Expand Down Expand Up @@ -46,7 +46,7 @@ FROM microsoft/nanoserver

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

ENV NODE_VERSION 10.0.0
ENV NODE_VERSION 10.1.0

COPY --from=download /nodejs /nodejs
COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]
Expand Down
18 changes: 9 additions & 9 deletions 10/windows/windowsservercore/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM microsoft/windowsservercore as download

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

ENV NODE_VERSION 10.0.0
ENV NODE_VERSION 10.1.0

ENV GPG_VERSION 2.3.4

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

RUN @( \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
) | foreach { \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
Expand Down Expand Up @@ -46,7 +46,7 @@ FROM microsoft/windowsservercore

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

ENV NODE_VERSION 10.0.0
ENV NODE_VERSION 10.1.0

COPY --from=download /nodejs /nodejs
COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]
Expand Down
14 changes: 7 additions & 7 deletions 6/windows/nanoserver/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;

RUN @( \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
) | foreach { \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
Expand Down
14 changes: 7 additions & 7 deletions 6/windows/windowsservercore/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;

RUN @( \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
) | foreach { \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
Expand Down
14 changes: 7 additions & 7 deletions 8/windows/nanoserver/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;

RUN @( \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
) | foreach { \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
Expand Down
14 changes: 7 additions & 7 deletions 8/windows/windowsservercore/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;

RUN @( \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
) | foreach { \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
Expand Down
14 changes: 7 additions & 7 deletions 9/windows/nanoserver/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;

RUN @( \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
) | foreach { \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
Expand Down
14 changes: 7 additions & 7 deletions 9/windows/windowsservercore/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;

RUN @( \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
'56730D5401028683275BD23C23EFEFE93C4CFFFE' \
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
) | foreach { \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
Expand Down
9 changes: 1 addition & 8 deletions Dockerfile-nanoserver.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,7 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;

RUN @( \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
"${NODE_KEYS[@]}"
) | foreach { \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
} ; \
Expand Down
9 changes: 1 addition & 8 deletions Dockerfile-windowsservercore.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,7 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;

RUN @( \
'94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
'71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
'56730D5401028683275BD23C23EFEFE93C4CFFFE', \
'77984A986EBC2AA786BC0F66B01FBB92821C587A' \
"${NODE_KEYS[@]}"
) | foreach { \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
} ; \
Expand Down
2 changes: 1 addition & 1 deletion update.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function update_node_version {
while read -r line
do
pattern="\"\\$\\{$(echo "$key_type" | tr '[:lower:]' '[:upper:]')_KEYS\\[@\\]\\}\""
sed -E -i.bak -e "s/([ \\t]*)($pattern)/\\1${line}${new_line}\\1\\2/" "$dockerfile" && rm "$dockerfile".bak
sed -E -i.bak -e "s/([ \\t]*)($pattern)/\\1'${line}',${new_line}\\1\\2/" "$dockerfile" && rm "$dockerfile".bak
done < "keys/$key_type.keys"
sed -E -i.bak "/$pattern/d" "$dockerfile" && rm "$dockerfile".bak
done
Expand Down

0 comments on commit 4a05960

Please sign in to comment.