Merge branch 'master' into feature/1269-formalize-paths-in-package-co…

…mmands

.github/docker/rez-win-base/Dockerfile

@@ -2,11 +2,7 @@
 
 # Please Note: Any " requires \" in the Dockerfile for windows.
 
-# The windows version has to match the host system.
-# 1809 ->	10.0.17763.805 -> windows-2019
-# Compare: https://hub.docker.com/_/microsoft-windows-servercore
-ARG WINDOWS_VERSION=1809-amd64
-
+ARG WINDOWS_VERSION
 FROM mcr.microsoft.com/windows/servercore:$WINDOWS_VERSION
 
 SHELL ["powershell.exe", "-NoLogo", "-NoProfile", "-ExecutionPolicy", "ByPass"]

.github/docker/rez-win-py/Dockerfile

@@ -1,14 +1,11 @@
 # escape=`
 
-# Tag of base image to use
-ARG BASE_TAG
+ARG BASE_IMAGE_NAME
+FROM $BASE_IMAGE_NAME
 
-# Base image windows version
-FROM rez-win-base:$BASE_TAG
-
-# Tag applied to this image
-ARG PY_TAG
-ENV _PY_TAG=$PY_TAG
+# Name of this image
+ARG IMAGE_NAME
+ENV _IMAGE_NAME=$IMAGE_NAME
 
 # NOTE: Any " requires \" in the Dockerfile for windows.
 # NOTE: The order matters. ARG after the shell command will allow access via

.github/docker/rez-win-py/entrypoint.ps1

@@ -10,11 +10,8 @@ $ErrorActionPreference = "Stop"
 #
 ${ENV:PYTHONIOENCODING} = "UTF-8"
 
-# Print name of image being run, for debugging purposes. We can't show the
-# literal image name here, because it just uses 'latest' tagged image (see
-# explanation in windows-docker-image.yaml - on.push)
-#
-Write-Output "Using docker image rez-win-py:${ENV:_PY_TAG}"
+# Print name of image being run, for debugging purposes
+Write-Output "Using docker image ${ENV:_IMAGE_NAME}"
 
 # Verify Python
 #