Upgraded windows images to 20h2

This commit is contained in:
2022-04-05 02:42:09 +09:00
parent 2ede966b71
commit ec55e174db
9 changed files with 32 additions and 25 deletions

View File

@@ -1,4 +1,4 @@
FROM astrojs/jre-nanoserver-1809:latest
FROM astrojs/jre-nanoserver-20h2:latest
RUN pip3 install Flask redis compressinja celery

View File

@@ -3,10 +3,10 @@ version: '3.9'
services:
python:
build: pyrt
image: astrojs/pyrt-nanoserver-1809
image: astrojs/pyrt-nanoserver-20h2
jre:
build: jre
image: astrojs/jre-nanoserver-1809
image: astrojs/jre-nanoserver-20h2
redis:
container_name: astrojsdev_redis
build: redis
@@ -24,7 +24,6 @@ services:
- 5000:5000
volumes:
- ../:C:/app
- cache:C:/app/cache
tasks:
container_name: astrojsdev_compiler
image: astrojs/app
@@ -34,7 +33,6 @@ services:
- web
volumes:
- ../:C:/app
- cache:C:/app/cache
volumes:
cache:

View File

@@ -1,9 +1,9 @@
FROM astrojs/pyrt-nanoserver-1809:latest as base
FROM astrojs/pyrt-nanoserver-20h2:latest as base
ENV JAVA_HOME=C:\\openjdk-11
ENV JAVA_VERSION=11.0.12
RUN setx PATH "$Env:JAVA_HOME\bin`;$Env:Path" /M
COPY --from=openjdk:11-jre-nanoserver-1809 /openjdk-11 /openjdk-11
COPY --from=openjdk:11-jre-nanoserver /openjdk-11 /openjdk-11
RUN echo Verifying install ... && echo java --version && java --version && echo Complete.

View File

@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/powershell:nanoserver-1809
FROM mcr.microsoft.com/powershell:nanoserver-20h2
SHELL [ "pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';" ]
@@ -13,7 +13,7 @@ RUN $url = 'https://www.python.org/ftp/python/3.7.6/python-3.7.6-embed-amd64.zip
### Begin workaround ###
# Note that changing user on nanoserver is not recommended
# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
# But we are working around a bug introduced in the nanoserver image introduced in 1809
# But we are working around a bug introduced in the nanoserver image introduced in 20h2
USER ContainerAdministrator
# This is basically the correct code except for the /M

View File

@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/powershell:nanoserver-1809
FROM mcr.microsoft.com/powershell:nanoserver-20h2
SHELL [ "pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';" ]