Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update haxe images. #6281

Merged
merged 3 commits into from
Jul 12, 2019
Merged

Update haxe images. #6281

merged 3 commits into from
Jul 12, 2019

Conversation

andyli
Copy link
Contributor

@andyli andyli commented Jul 11, 2019

Add buster, use it as default variant.
Add alpine3.10, remove alpine3.6 (EOL).
Fix haxelib missing dll on windows variants.
Add windowsservercore-1803.
Add version alias to the windows variants.

Add buster, use it as default variant.
Add alpine3.10, remove alpine3.6 (EOL).
Fix haxelib missing dll on windows variants.
Add windowsservercore-1803.
Add version alias to the windows variants.
@tianon
Copy link
Member

tianon commented Jul 11, 2019

If you want two entries to share the same aliases, you're looking for SharedTags: (golang is likely a good example).

@yosifkit
Copy link
Member

mongo is a good example as well

Tags: 4.0.10-xenial, 4.0-xenial, 4-xenial, xenial
SharedTags: 4.0.10, 4.0, 4, latest
# see http://repo.mongodb.org/apt/ubuntu/dists/xenial/mongodb-org/4.0/multiverse/
Architectures: amd64, arm64v8
GitCommit: 3f117ac35a947ddff307aee85ecd5abe9e3a0fe1
Directory: 4.0
Tags: 4.0.10-windowsservercore-ltsc2016, 4.0-windowsservercore-ltsc2016, 4-windowsservercore-ltsc2016, windowsservercore-ltsc2016
SharedTags: 4.0.10-windowsservercore, 4.0-windowsservercore, 4-windowsservercore, windowsservercore, 4.0.10, 4.0, 4, latest
Architectures: windows-amd64
GitCommit: c58c418b46908e255700bdb62517fdd96afac9c5
Directory: 4.0/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
Tags: 4.0.10-windowsservercore-1803, 4.0-windowsservercore-1803, 4-windowsservercore-1803, windowsservercore-1803
SharedTags: 4.0.10-windowsservercore, 4.0-windowsservercore, 4-windowsservercore, windowsservercore, 4.0.10, 4.0, 4, latest

@andyli
Copy link
Contributor Author

andyli commented Jul 11, 2019

Didn't notice SharedTags, thanks for the pointers!
Let me know if I use it correctly.

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 25d4d0b..ee0e07e 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,57 +1,74 @@
-haxe:3.1 @ amd64
-haxe:3.1 @ arm32v7
-haxe:3.1 @ arm64v8
 haxe:3.1-jessie @ amd64
-haxe:3.1-windowsservercore @ windows-amd64
-haxe:3.2 @ amd64
-haxe:3.2 @ arm32v7
-haxe:3.2 @ arm64v8
-haxe:3.2-alpine3.6 @ amd64
-haxe:3.2-alpine3.6 @ arm64v8
+haxe:3.1-stretch @ amd64
+haxe:3.1-stretch @ arm32v7
+haxe:3.1-stretch @ arm64v8
+haxe:3.1-windowsservercore-1803 @ windows-amd64
+haxe:3.1-windowsservercore-ltsc2016 @ windows-amd64
 haxe:3.2-alpine3.7 @ amd64
 haxe:3.2-alpine3.7 @ arm64v8
 haxe:3.2-alpine3.8 @ amd64
 haxe:3.2-alpine3.8 @ arm64v8
+haxe:3.2-alpine3.9 @ amd64
+haxe:3.2-alpine3.9 @ arm64v8
 haxe:3.2-alpine @ amd64
 haxe:3.2-alpine @ arm64v8
+haxe:3.2-buster @ amd64
+haxe:3.2-buster @ arm32v7
+haxe:3.2-buster @ arm64v8
 haxe:3.2-jessie @ amd64
-haxe:3.2-windowsservercore @ windows-amd64
-haxe:3.3 @ amd64
-haxe:3.3 @ arm32v7
-haxe:3.3 @ arm64v8
-haxe:3.3-alpine3.6 @ amd64
-haxe:3.3-alpine3.6 @ arm64v8
+haxe:3.2-stretch @ amd64
+haxe:3.2-stretch @ arm32v7
+haxe:3.2-stretch @ arm64v8
+haxe:3.2-windowsservercore-1803 @ windows-amd64
+haxe:3.2-windowsservercore-ltsc2016 @ windows-amd64
 haxe:3.3-alpine3.7 @ amd64
 haxe:3.3-alpine3.7 @ arm64v8
 haxe:3.3-alpine3.8 @ amd64
 haxe:3.3-alpine3.8 @ arm64v8
+haxe:3.3-alpine3.9 @ amd64
+haxe:3.3-alpine3.9 @ arm64v8
 haxe:3.3-alpine @ amd64
 haxe:3.3-alpine @ arm64v8
+haxe:3.3-buster @ amd64
+haxe:3.3-buster @ arm32v7
+haxe:3.3-buster @ arm64v8
 haxe:3.3-jessie @ amd64
-haxe:3.3-windowsservercore @ windows-amd64
-haxe:3.4-alpine3.6 @ amd64
-haxe:3.4-alpine3.6 @ arm64v8
+haxe:3.3-stretch @ amd64
+haxe:3.3-stretch @ arm32v7
+haxe:3.3-stretch @ arm64v8
+haxe:3.3-windowsservercore-1803 @ windows-amd64
+haxe:3.3-windowsservercore-ltsc2016 @ windows-amd64
 haxe:3.4-alpine3.7 @ amd64
 haxe:3.4-alpine3.7 @ arm64v8
 haxe:3.4-alpine3.8 @ amd64
 haxe:3.4-alpine3.8 @ arm64v8
+haxe:3.4-alpine3.9 @ amd64
+haxe:3.4-alpine3.9 @ arm64v8
 haxe:3.4-alpine @ amd64
 haxe:3.4-alpine @ arm64v8
+haxe:3.4-buster @ amd64
+haxe:3.4-buster @ arm32v7
+haxe:3.4-buster @ arm64v8
 haxe:3.4-jessie @ amd64
-haxe:3.4-windowsservercore @ windows-amd64
-haxe:4.0 @ amd64
-haxe:4.0 @ arm32v7
-haxe:4.0 @ arm64v8
-haxe:4.0-alpine3.6 @ amd64
-haxe:4.0-alpine3.6 @ arm64v8
+haxe:3.4-stretch @ amd64
+haxe:3.4-stretch @ arm32v7
+haxe:3.4-stretch @ arm64v8
+haxe:3.4-windowsservercore-1803 @ windows-amd64
+haxe:3.4-windowsservercore-ltsc2016 @ windows-amd64
 haxe:4.0-alpine3.7 @ amd64
 haxe:4.0-alpine3.7 @ arm64v8
 haxe:4.0-alpine3.8 @ amd64
 haxe:4.0-alpine3.8 @ arm64v8
+haxe:4.0-alpine3.9 @ amd64
+haxe:4.0-alpine3.9 @ arm64v8
 haxe:4.0-alpine @ amd64
 haxe:4.0-alpine @ arm64v8
+haxe:4.0-buster @ amd64
+haxe:4.0-buster @ arm32v7
+haxe:4.0-buster @ arm64v8
 haxe:4.0-jessie @ amd64
-haxe:4.0-windowsservercore @ windows-amd64
-haxe:latest @ amd64
-haxe:latest @ arm32v7
-haxe:latest @ arm64v8
+haxe:4.0-stretch @ amd64
+haxe:4.0-stretch @ arm32v7
+haxe:4.0-stretch @ arm64v8
+haxe:4.0-windowsservercore-1803 @ windows-amd64
+haxe:4.0-windowsservercore-ltsc2016 @ windows-amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 06ae456..4702d4e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,110 +2,132 @@ haxe:3.1
 haxe:3.1-jessie
 haxe:3.1-stretch
 haxe:3.1-windowsservercore
+haxe:3.1-windowsservercore-1803
 haxe:3.1-windowsservercore-ltsc2016
 haxe:3.1.3
 haxe:3.1.3-jessie
 haxe:3.1.3-stretch
 haxe:3.1.3-windowsservercore
+haxe:3.1.3-windowsservercore-1803
 haxe:3.1.3-windowsservercore-ltsc2016
 haxe:3.2
 haxe:3.2-alpine
-haxe:3.2-alpine3.6
 haxe:3.2-alpine3.7
 haxe:3.2-alpine3.8
 haxe:3.2-alpine3.9
+haxe:3.2-alpine3.10
+haxe:3.2-buster
 haxe:3.2-jessie
 haxe:3.2-stretch
 haxe:3.2-windowsservercore
+haxe:3.2-windowsservercore-1803
 haxe:3.2-windowsservercore-ltsc2016
 haxe:3.2.1
 haxe:3.2.1-alpine
-haxe:3.2.1-alpine3.6
 haxe:3.2.1-alpine3.7
 haxe:3.2.1-alpine3.8
 haxe:3.2.1-alpine3.9
+haxe:3.2.1-alpine3.10
+haxe:3.2.1-buster
 haxe:3.2.1-jessie
 haxe:3.2.1-stretch
 haxe:3.2.1-windowsservercore
+haxe:3.2.1-windowsservercore-1803
 haxe:3.2.1-windowsservercore-ltsc2016
 haxe:3.3
 haxe:3.3-alpine
-haxe:3.3-alpine3.6
 haxe:3.3-alpine3.7
 haxe:3.3-alpine3.8
 haxe:3.3-alpine3.9
+haxe:3.3-alpine3.10
+haxe:3.3-buster
 haxe:3.3-jessie
 haxe:3.3-stretch
 haxe:3.3-windowsservercore
+haxe:3.3-windowsservercore-1803
 haxe:3.3-windowsservercore-ltsc2016
 haxe:3.3.0
 haxe:3.3.0-alpine
-haxe:3.3.0-alpine3.6
 haxe:3.3.0-alpine3.7
 haxe:3.3.0-alpine3.8
 haxe:3.3.0-alpine3.9
+haxe:3.3.0-alpine3.10
+haxe:3.3.0-buster
 haxe:3.3.0-jessie
 haxe:3.3.0-rc.1
 haxe:3.3.0-rc.1-alpine
-haxe:3.3.0-rc.1-alpine3.6
 haxe:3.3.0-rc.1-alpine3.7
 haxe:3.3.0-rc.1-alpine3.8
 haxe:3.3.0-rc.1-alpine3.9
+haxe:3.3.0-rc.1-alpine3.10
+haxe:3.3.0-rc.1-buster
 haxe:3.3.0-rc.1-jessie
 haxe:3.3.0-rc.1-stretch
 haxe:3.3.0-rc.1-windowsservercore
+haxe:3.3.0-rc.1-windowsservercore-1803
 haxe:3.3.0-rc.1-windowsservercore-ltsc2016
 haxe:3.3.0-stretch
 haxe:3.3.0-windowsservercore
+haxe:3.3.0-windowsservercore-1803
 haxe:3.3.0-windowsservercore-ltsc2016
 haxe:3.4
 haxe:3.4-alpine
-haxe:3.4-alpine3.6
 haxe:3.4-alpine3.7
 haxe:3.4-alpine3.8
 haxe:3.4-alpine3.9
+haxe:3.4-alpine3.10
+haxe:3.4-buster
 haxe:3.4-jessie
 haxe:3.4-stretch
 haxe:3.4-windowsservercore
+haxe:3.4-windowsservercore-1803
 haxe:3.4-windowsservercore-ltsc2016
 haxe:3.4.7
 haxe:3.4.7-alpine
-haxe:3.4.7-alpine3.6
 haxe:3.4.7-alpine3.7
 haxe:3.4.7-alpine3.8
 haxe:3.4.7-alpine3.9
+haxe:3.4.7-alpine3.10
+haxe:3.4.7-buster
 haxe:3.4.7-jessie
 haxe:3.4.7-stretch
 haxe:3.4.7-windowsservercore
+haxe:3.4.7-windowsservercore-1803
 haxe:3.4.7-windowsservercore-ltsc2016
 haxe:4.0
 haxe:4.0-alpine
-haxe:4.0-alpine3.6
 haxe:4.0-alpine3.7
 haxe:4.0-alpine3.8
 haxe:4.0-alpine3.9
+haxe:4.0-alpine3.10
+haxe:4.0-buster
 haxe:4.0-jessie
 haxe:4.0-stretch
 haxe:4.0-windowsservercore
+haxe:4.0-windowsservercore-1803
 haxe:4.0-windowsservercore-ltsc2016
 haxe:4.0.0
 haxe:4.0.0-alpine
-haxe:4.0.0-alpine3.6
 haxe:4.0.0-alpine3.7
 haxe:4.0.0-alpine3.8
 haxe:4.0.0-alpine3.9
+haxe:4.0.0-alpine3.10
+haxe:4.0.0-buster
 haxe:4.0.0-jessie
 haxe:4.0.0-rc.3
 haxe:4.0.0-rc.3-alpine
-haxe:4.0.0-rc.3-alpine3.6
 haxe:4.0.0-rc.3-alpine3.7
 haxe:4.0.0-rc.3-alpine3.8
 haxe:4.0.0-rc.3-alpine3.9
+haxe:4.0.0-rc.3-alpine3.10
+haxe:4.0.0-rc.3-buster
 haxe:4.0.0-rc.3-jessie
 haxe:4.0.0-rc.3-stretch
 haxe:4.0.0-rc.3-windowsservercore
+haxe:4.0.0-rc.3-windowsservercore-1803
 haxe:4.0.0-rc.3-windowsservercore-ltsc2016
 haxe:4.0.0-stretch
 haxe:4.0.0-windowsservercore
+haxe:4.0.0-windowsservercore-1803
 haxe:4.0.0-windowsservercore-ltsc2016
 haxe:latest
diff --git a/_bashbrew-shared-tags b/_bashbrew-shared-tags
index e69de29..1acc565 100644
--- a/_bashbrew-shared-tags
+++ b/_bashbrew-shared-tags
@@ -0,0 +1,25 @@
+haxe:3.1 -- haxe:3.1-windowsservercore-1803, haxe:3.1-windowsservercore-ltsc2016
+haxe:3.1-windowsservercore -- haxe:3.1-windowsservercore-1803, haxe:3.1-windowsservercore-ltsc2016
+haxe:3.1.3 -- haxe:3.1-windowsservercore-1803, haxe:3.1-windowsservercore-ltsc2016
+haxe:3.1.3-windowsservercore -- haxe:3.1-windowsservercore-1803, haxe:3.1-windowsservercore-ltsc2016
+haxe:3.2 -- haxe:3.2-buster, haxe:3.2-windowsservercore-1803, haxe:3.2-windowsservercore-ltsc2016
+haxe:3.2-windowsservercore -- haxe:3.2-windowsservercore-1803, haxe:3.2-windowsservercore-ltsc2016
+haxe:3.2.1 -- haxe:3.2-buster, haxe:3.2-windowsservercore-1803, haxe:3.2-windowsservercore-ltsc2016
+haxe:3.2.1-windowsservercore -- haxe:3.2-windowsservercore-1803, haxe:3.2-windowsservercore-ltsc2016
+haxe:3.3 -- haxe:3.3-buster, haxe:3.3-windowsservercore-1803, haxe:3.3-windowsservercore-ltsc2016
+haxe:3.3-windowsservercore -- haxe:3.3-windowsservercore-1803, haxe:3.3-windowsservercore-ltsc2016
+haxe:3.3.0 -- haxe:3.3-buster, haxe:3.3-windowsservercore-1803, haxe:3.3-windowsservercore-ltsc2016
+haxe:3.3.0-rc.1 -- haxe:3.3-buster, haxe:3.3-windowsservercore-1803, haxe:3.3-windowsservercore-ltsc2016
+haxe:3.3.0-rc.1-windowsservercore -- haxe:3.3-windowsservercore-1803, haxe:3.3-windowsservercore-ltsc2016
+haxe:3.3.0-windowsservercore -- haxe:3.3-windowsservercore-1803, haxe:3.3-windowsservercore-ltsc2016
+haxe:3.4 -- haxe:3.4-buster, haxe:3.4-windowsservercore-1803, haxe:3.4-windowsservercore-ltsc2016
+haxe:3.4-windowsservercore -- haxe:3.4-windowsservercore-1803, haxe:3.4-windowsservercore-ltsc2016
+haxe:3.4.7 -- haxe:3.4-buster, haxe:3.4-windowsservercore-1803, haxe:3.4-windowsservercore-ltsc2016
+haxe:3.4.7-windowsservercore -- haxe:3.4-windowsservercore-1803, haxe:3.4-windowsservercore-ltsc2016
+haxe:4.0 -- haxe:4.0-buster, haxe:4.0-windowsservercore-1803, haxe:4.0-windowsservercore-ltsc2016
+haxe:4.0-windowsservercore -- haxe:4.0-windowsservercore-1803, haxe:4.0-windowsservercore-ltsc2016
+haxe:4.0.0 -- haxe:4.0-buster, haxe:4.0-windowsservercore-1803, haxe:4.0-windowsservercore-ltsc2016
+haxe:4.0.0-rc.3 -- haxe:4.0-buster, haxe:4.0-windowsservercore-1803, haxe:4.0-windowsservercore-ltsc2016
+haxe:4.0.0-rc.3-windowsservercore -- haxe:4.0-windowsservercore-1803, haxe:4.0-windowsservercore-ltsc2016
+haxe:4.0.0-windowsservercore -- haxe:4.0-windowsservercore-1803, haxe:4.0-windowsservercore-ltsc2016
+haxe:latest -- haxe:3.4-buster, haxe:3.4-windowsservercore-1803, haxe:3.4-windowsservercore-ltsc2016
diff --git a/haxe_3.1/Dockerfile b/haxe_3.1-stretch/Dockerfile
similarity index 100%
rename from haxe_3.1/Dockerfile
rename to haxe_3.1-stretch/Dockerfile
diff --git a/haxe_3.1-windowsservercore/Dockerfile b/haxe_3.1-windowsservercore-1803/Dockerfile
similarity index 53%
copy from haxe_3.1-windowsservercore/Dockerfile
copy to haxe_3.1-windowsservercore-1803/Dockerfile
index 01b6ac7..ca6dee0 100644
--- a/haxe_3.1-windowsservercore/Dockerfile
+++ b/haxe_3.1-windowsservercore-1803/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2016
+FROM mcr.microsoft.com/windows/servercore:1803
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
@@ -20,6 +20,58 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
+# install Amazon Root CA (expires in 2037), which allows haxelib to talk to https://lib.haxe.org
+RUN $cert = \"-----BEGIN CERTIFICATE-----`n\
+MIIEkjCCA3qgAwIBAgITBn+USionzfP6wq4rAfkI7rnExjANBgkqhkiG9w0BAQsF`n\
+ADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNj`n\
+b3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4x`n\
+OzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1`n\
+dGhvcml0eSAtIEcyMB4XDTE1MDUyNTEyMDAwMFoXDTM3MTIzMTAxMDAwMFowOTEL`n\
+MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv`n\
+b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj`n\
+ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM`n\
+9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw`n\
+IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6`n\
+VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L`n\
+93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm`n\
+jgSubJrIqg0CAwEAAaOCATEwggEtMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/`n\
+BAQDAgGGMB0GA1UdDgQWBBSEGMyFNOy8DJSULghZnMeyEE4KCDAfBgNVHSMEGDAW`n\
+gBScXwDfqgHXMCs4iKK4bUqc8hGRgzB4BggrBgEFBQcBAQRsMGowLgYIKwYBBQUH`n\
+MAGGImh0dHA6Ly9vY3NwLnJvb3RnMi5hbWF6b250cnVzdC5jb20wOAYIKwYBBQUH`n\
+MAKGLGh0dHA6Ly9jcnQucm9vdGcyLmFtYXpvbnRydXN0LmNvbS9yb290ZzIuY2Vy`n\
+MD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly9jcmwucm9vdGcyLmFtYXpvbnRydXN0`n\
+LmNvbS9yb290ZzIuY3JsMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsF`n\
+AAOCAQEAYjdCXLwQtT6LLOkMm2xF4gcAevnFWAu5CIw+7bMlPLVvUOTNNWqnkzSW`n\
+MiGpSESrnO09tKpzbeR/FoCJbM8oAxiDR3mjEH4wW6w7sGDgd9QIpuEdfF7Au/ma`n\
+eyKdpwAJfqxGF4PcnCZXmTA5YpaP7dreqsXMGz7KQ2hsVxa81Q4gLv7/wmpdLqBK`n\
+bRRYh5TmOTFffHPLkIhqhBGWJ6bt2YFGpn6jcgAKUj6DiAdjd4lpFw85hdKrCEVN`n\
+0FE6/V1dN2RMfjCyVSRCnTawXZwXgWHxyvkQAiSr6w10kY17RSlQOYiypok1JR4U`n\
+akcjMS9cmvqtmg5iUaQqqcT5NJ0hGA==`n\
+-----END CERTIFICATE-----\";\
+	Set-Content -Path C:\amazon.cer -Value $cert; \
+	Import-Certificate -FilePath C:\amazon.cer -CertStoreLocation Cert:\LocalMachine\Root\; \
+	Remove-Item -Path C:\amazon.cer;
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +125,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.1.3/haxe-
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
diff --git a/haxe_3.1-windowsservercore/Dockerfile b/haxe_3.1-windowsservercore-ltsc2016/Dockerfile
similarity index 54%
rename from haxe_3.1-windowsservercore/Dockerfile
rename to haxe_3.1-windowsservercore-ltsc2016/Dockerfile
index 01b6ac7..c46859f 100644
--- a/haxe_3.1-windowsservercore/Dockerfile
+++ b/haxe_3.1-windowsservercore-ltsc2016/Dockerfile
@@ -20,6 +20,58 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
+# install Amazon Root CA (expires in 2037), which allows haxelib to talk to https://lib.haxe.org
+RUN $cert = \"-----BEGIN CERTIFICATE-----`n\
+MIIEkjCCA3qgAwIBAgITBn+USionzfP6wq4rAfkI7rnExjANBgkqhkiG9w0BAQsF`n\
+ADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNj`n\
+b3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4x`n\
+OzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1`n\
+dGhvcml0eSAtIEcyMB4XDTE1MDUyNTEyMDAwMFoXDTM3MTIzMTAxMDAwMFowOTEL`n\
+MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv`n\
+b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj`n\
+ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM`n\
+9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw`n\
+IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6`n\
+VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L`n\
+93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm`n\
+jgSubJrIqg0CAwEAAaOCATEwggEtMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/`n\
+BAQDAgGGMB0GA1UdDgQWBBSEGMyFNOy8DJSULghZnMeyEE4KCDAfBgNVHSMEGDAW`n\
+gBScXwDfqgHXMCs4iKK4bUqc8hGRgzB4BggrBgEFBQcBAQRsMGowLgYIKwYBBQUH`n\
+MAGGImh0dHA6Ly9vY3NwLnJvb3RnMi5hbWF6b250cnVzdC5jb20wOAYIKwYBBQUH`n\
+MAKGLGh0dHA6Ly9jcnQucm9vdGcyLmFtYXpvbnRydXN0LmNvbS9yb290ZzIuY2Vy`n\
+MD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly9jcmwucm9vdGcyLmFtYXpvbnRydXN0`n\
+LmNvbS9yb290ZzIuY3JsMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsF`n\
+AAOCAQEAYjdCXLwQtT6LLOkMm2xF4gcAevnFWAu5CIw+7bMlPLVvUOTNNWqnkzSW`n\
+MiGpSESrnO09tKpzbeR/FoCJbM8oAxiDR3mjEH4wW6w7sGDgd9QIpuEdfF7Au/ma`n\
+eyKdpwAJfqxGF4PcnCZXmTA5YpaP7dreqsXMGz7KQ2hsVxa81Q4gLv7/wmpdLqBK`n\
+bRRYh5TmOTFffHPLkIhqhBGWJ6bt2YFGpn6jcgAKUj6DiAdjd4lpFw85hdKrCEVN`n\
+0FE6/V1dN2RMfjCyVSRCnTawXZwXgWHxyvkQAiSr6w10kY17RSlQOYiypok1JR4U`n\
+akcjMS9cmvqtmg5iUaQqqcT5NJ0hGA==`n\
+-----END CERTIFICATE-----\";\
+	Set-Content -Path C:\amazon.cer -Value $cert; \
+	Import-Certificate -FilePath C:\amazon.cer -CertStoreLocation Cert:\LocalMachine\Root\; \
+	Remove-Item -Path C:\amazon.cer;
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +125,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.1.3/haxe-
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
diff --git a/haxe_3.2-alpine/Dockerfile b/haxe_3.2-alpine/Dockerfile
index 5b5c0e1..33f8dc4 100644
--- a/haxe_3.2-alpine/Dockerfile
+++ b/haxe_3.2-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.9
+FROM alpine:3.10
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
diff --git a/haxe_3.2-alpine3.6/Dockerfile b/haxe_3.2-alpine3.6/Dockerfile
deleted file mode 100644
index 11b40c0..0000000
diff --git a/haxe_3.2-alpine/Dockerfile b/haxe_3.2-alpine3.9/Dockerfile
similarity index 100%
copy from haxe_3.2-alpine/Dockerfile
copy to haxe_3.2-alpine3.9/Dockerfile
diff --git a/haxe_3.2/Dockerfile b/haxe_3.2-buster/Dockerfile
similarity index 96%
copy from haxe_3.2/Dockerfile
copy to haxe_3.2-buster/Dockerfile
index 877849f..61f5687 100644
--- a/haxe_3.2/Dockerfile
+++ b/haxe_3.2-buster/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:stretch-scm
+FROM buildpack-deps:buster-scm
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
@@ -14,10 +14,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		libgc1c2 \
 		zlib1g \
 		libpcre3 \
-		libmariadb2 \
+		libmariadb3 \
 		libsqlite3-0 \
-		libmbedcrypto0 \
-		libmbedtls10 \
+		libmbedcrypto3 \
+		libmbedtls12 \
 		libmbedx509-0 \
 	&& rm -rf /var/lib/apt/lists/*
 
diff --git a/haxe_3.2/Dockerfile b/haxe_3.2-stretch/Dockerfile
similarity index 100%
rename from haxe_3.2/Dockerfile
rename to haxe_3.2-stretch/Dockerfile
diff --git a/haxe_3.2-windowsservercore/Dockerfile b/haxe_3.2-windowsservercore-1803/Dockerfile
similarity index 53%
copy from haxe_3.2-windowsservercore/Dockerfile
copy to haxe_3.2-windowsservercore-1803/Dockerfile
index 255e75e..ae9f035 100644
--- a/haxe_3.2-windowsservercore/Dockerfile
+++ b/haxe_3.2-windowsservercore-1803/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2016
+FROM mcr.microsoft.com/windows/servercore:1803
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
@@ -20,6 +20,58 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
+# install Amazon Root CA (expires in 2037), which allows haxelib to talk to https://lib.haxe.org
+RUN $cert = \"-----BEGIN CERTIFICATE-----`n\
+MIIEkjCCA3qgAwIBAgITBn+USionzfP6wq4rAfkI7rnExjANBgkqhkiG9w0BAQsF`n\
+ADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNj`n\
+b3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4x`n\
+OzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1`n\
+dGhvcml0eSAtIEcyMB4XDTE1MDUyNTEyMDAwMFoXDTM3MTIzMTAxMDAwMFowOTEL`n\
+MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv`n\
+b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj`n\
+ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM`n\
+9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw`n\
+IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6`n\
+VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L`n\
+93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm`n\
+jgSubJrIqg0CAwEAAaOCATEwggEtMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/`n\
+BAQDAgGGMB0GA1UdDgQWBBSEGMyFNOy8DJSULghZnMeyEE4KCDAfBgNVHSMEGDAW`n\
+gBScXwDfqgHXMCs4iKK4bUqc8hGRgzB4BggrBgEFBQcBAQRsMGowLgYIKwYBBQUH`n\
+MAGGImh0dHA6Ly9vY3NwLnJvb3RnMi5hbWF6b250cnVzdC5jb20wOAYIKwYBBQUH`n\
+MAKGLGh0dHA6Ly9jcnQucm9vdGcyLmFtYXpvbnRydXN0LmNvbS9yb290ZzIuY2Vy`n\
+MD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly9jcmwucm9vdGcyLmFtYXpvbnRydXN0`n\
+LmNvbS9yb290ZzIuY3JsMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsF`n\
+AAOCAQEAYjdCXLwQtT6LLOkMm2xF4gcAevnFWAu5CIw+7bMlPLVvUOTNNWqnkzSW`n\
+MiGpSESrnO09tKpzbeR/FoCJbM8oAxiDR3mjEH4wW6w7sGDgd9QIpuEdfF7Au/ma`n\
+eyKdpwAJfqxGF4PcnCZXmTA5YpaP7dreqsXMGz7KQ2hsVxa81Q4gLv7/wmpdLqBK`n\
+bRRYh5TmOTFffHPLkIhqhBGWJ6bt2YFGpn6jcgAKUj6DiAdjd4lpFw85hdKrCEVN`n\
+0FE6/V1dN2RMfjCyVSRCnTawXZwXgWHxyvkQAiSr6w10kY17RSlQOYiypok1JR4U`n\
+akcjMS9cmvqtmg5iUaQqqcT5NJ0hGA==`n\
+-----END CERTIFICATE-----\";\
+	Set-Content -Path C:\amazon.cer -Value $cert; \
+	Import-Certificate -FilePath C:\amazon.cer -CertStoreLocation Cert:\LocalMachine\Root\; \
+	Remove-Item -Path C:\amazon.cer;
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +125,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.2.1/haxe-
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
diff --git a/haxe_3.2-windowsservercore/Dockerfile b/haxe_3.2-windowsservercore-ltsc2016/Dockerfile
similarity index 54%
rename from haxe_3.2-windowsservercore/Dockerfile
rename to haxe_3.2-windowsservercore-ltsc2016/Dockerfile
index 255e75e..259fd10 100644
--- a/haxe_3.2-windowsservercore/Dockerfile
+++ b/haxe_3.2-windowsservercore-ltsc2016/Dockerfile
@@ -20,6 +20,58 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
+# install Amazon Root CA (expires in 2037), which allows haxelib to talk to https://lib.haxe.org
+RUN $cert = \"-----BEGIN CERTIFICATE-----`n\
+MIIEkjCCA3qgAwIBAgITBn+USionzfP6wq4rAfkI7rnExjANBgkqhkiG9w0BAQsF`n\
+ADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNj`n\
+b3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4x`n\
+OzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1`n\
+dGhvcml0eSAtIEcyMB4XDTE1MDUyNTEyMDAwMFoXDTM3MTIzMTAxMDAwMFowOTEL`n\
+MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv`n\
+b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj`n\
+ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM`n\
+9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw`n\
+IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6`n\
+VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L`n\
+93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm`n\
+jgSubJrIqg0CAwEAAaOCATEwggEtMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/`n\
+BAQDAgGGMB0GA1UdDgQWBBSEGMyFNOy8DJSULghZnMeyEE4KCDAfBgNVHSMEGDAW`n\
+gBScXwDfqgHXMCs4iKK4bUqc8hGRgzB4BggrBgEFBQcBAQRsMGowLgYIKwYBBQUH`n\
+MAGGImh0dHA6Ly9vY3NwLnJvb3RnMi5hbWF6b250cnVzdC5jb20wOAYIKwYBBQUH`n\
+MAKGLGh0dHA6Ly9jcnQucm9vdGcyLmFtYXpvbnRydXN0LmNvbS9yb290ZzIuY2Vy`n\
+MD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly9jcmwucm9vdGcyLmFtYXpvbnRydXN0`n\
+LmNvbS9yb290ZzIuY3JsMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsF`n\
+AAOCAQEAYjdCXLwQtT6LLOkMm2xF4gcAevnFWAu5CIw+7bMlPLVvUOTNNWqnkzSW`n\
+MiGpSESrnO09tKpzbeR/FoCJbM8oAxiDR3mjEH4wW6w7sGDgd9QIpuEdfF7Au/ma`n\
+eyKdpwAJfqxGF4PcnCZXmTA5YpaP7dreqsXMGz7KQ2hsVxa81Q4gLv7/wmpdLqBK`n\
+bRRYh5TmOTFffHPLkIhqhBGWJ6bt2YFGpn6jcgAKUj6DiAdjd4lpFw85hdKrCEVN`n\
+0FE6/V1dN2RMfjCyVSRCnTawXZwXgWHxyvkQAiSr6w10kY17RSlQOYiypok1JR4U`n\
+akcjMS9cmvqtmg5iUaQqqcT5NJ0hGA==`n\
+-----END CERTIFICATE-----\";\
+	Set-Content -Path C:\amazon.cer -Value $cert; \
+	Import-Certificate -FilePath C:\amazon.cer -CertStoreLocation Cert:\LocalMachine\Root\; \
+	Remove-Item -Path C:\amazon.cer;
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +125,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.2.1/haxe-
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
diff --git a/haxe_3.3-alpine/Dockerfile b/haxe_3.3-alpine/Dockerfile
index ef8b7da..97a9736 100644
--- a/haxe_3.3-alpine/Dockerfile
+++ b/haxe_3.3-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.9
+FROM alpine:3.10
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
diff --git a/haxe_3.3-alpine3.6/Dockerfile b/haxe_3.3-alpine3.6/Dockerfile
deleted file mode 100644
index cfc3a15..0000000
diff --git a/haxe_3.3-alpine/Dockerfile b/haxe_3.3-alpine3.9/Dockerfile
similarity index 100%
copy from haxe_3.3-alpine/Dockerfile
copy to haxe_3.3-alpine3.9/Dockerfile
diff --git a/haxe_3.3/Dockerfile b/haxe_3.3-buster/Dockerfile
similarity index 96%
copy from haxe_3.3/Dockerfile
copy to haxe_3.3-buster/Dockerfile
index c661713..2730cde 100644
--- a/haxe_3.3/Dockerfile
+++ b/haxe_3.3-buster/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:stretch-scm
+FROM buildpack-deps:buster-scm
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
@@ -14,10 +14,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		libgc1c2 \
 		zlib1g \
 		libpcre3 \
-		libmariadb2 \
+		libmariadb3 \
 		libsqlite3-0 \
-		libmbedcrypto0 \
-		libmbedtls10 \
+		libmbedcrypto3 \
+		libmbedtls12 \
 		libmbedx509-0 \
 	&& rm -rf /var/lib/apt/lists/*
 
diff --git a/haxe_3.3/Dockerfile b/haxe_3.3-stretch/Dockerfile
similarity index 100%
rename from haxe_3.3/Dockerfile
rename to haxe_3.3-stretch/Dockerfile
diff --git a/haxe_3.3-windowsservercore/Dockerfile b/haxe_3.3-windowsservercore-1803/Dockerfile
similarity index 53%
copy from haxe_3.3-windowsservercore/Dockerfile
copy to haxe_3.3-windowsservercore-1803/Dockerfile
index 22e0c0b..1926da5 100644
--- a/haxe_3.3-windowsservercore/Dockerfile
+++ b/haxe_3.3-windowsservercore-1803/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2016
+FROM mcr.microsoft.com/windows/servercore:1803
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
@@ -20,6 +20,58 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
+# install Amazon Root CA (expires in 2037), which allows haxelib to talk to https://lib.haxe.org
+RUN $cert = \"-----BEGIN CERTIFICATE-----`n\
+MIIEkjCCA3qgAwIBAgITBn+USionzfP6wq4rAfkI7rnExjANBgkqhkiG9w0BAQsF`n\
+ADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNj`n\
+b3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4x`n\
+OzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1`n\
+dGhvcml0eSAtIEcyMB4XDTE1MDUyNTEyMDAwMFoXDTM3MTIzMTAxMDAwMFowOTEL`n\
+MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv`n\
+b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj`n\
+ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM`n\
+9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw`n\
+IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6`n\
+VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L`n\
+93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm`n\
+jgSubJrIqg0CAwEAAaOCATEwggEtMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/`n\
+BAQDAgGGMB0GA1UdDgQWBBSEGMyFNOy8DJSULghZnMeyEE4KCDAfBgNVHSMEGDAW`n\
+gBScXwDfqgHXMCs4iKK4bUqc8hGRgzB4BggrBgEFBQcBAQRsMGowLgYIKwYBBQUH`n\
+MAGGImh0dHA6Ly9vY3NwLnJvb3RnMi5hbWF6b250cnVzdC5jb20wOAYIKwYBBQUH`n\
+MAKGLGh0dHA6Ly9jcnQucm9vdGcyLmFtYXpvbnRydXN0LmNvbS9yb290ZzIuY2Vy`n\
+MD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly9jcmwucm9vdGcyLmFtYXpvbnRydXN0`n\
+LmNvbS9yb290ZzIuY3JsMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsF`n\
+AAOCAQEAYjdCXLwQtT6LLOkMm2xF4gcAevnFWAu5CIw+7bMlPLVvUOTNNWqnkzSW`n\
+MiGpSESrnO09tKpzbeR/FoCJbM8oAxiDR3mjEH4wW6w7sGDgd9QIpuEdfF7Au/ma`n\
+eyKdpwAJfqxGF4PcnCZXmTA5YpaP7dreqsXMGz7KQ2hsVxa81Q4gLv7/wmpdLqBK`n\
+bRRYh5TmOTFffHPLkIhqhBGWJ6bt2YFGpn6jcgAKUj6DiAdjd4lpFw85hdKrCEVN`n\
+0FE6/V1dN2RMfjCyVSRCnTawXZwXgWHxyvkQAiSr6w10kY17RSlQOYiypok1JR4U`n\
+akcjMS9cmvqtmg5iUaQqqcT5NJ0hGA==`n\
+-----END CERTIFICATE-----\";\
+	Set-Content -Path C:\amazon.cer -Value $cert; \
+	Import-Certificate -FilePath C:\amazon.cer -CertStoreLocation Cert:\LocalMachine\Root\; \
+	Remove-Item -Path C:\amazon.cer;
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +125,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.3.0-rc1/h
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
diff --git a/haxe_3.3-windowsservercore/Dockerfile b/haxe_3.3-windowsservercore-ltsc2016/Dockerfile
similarity index 54%
rename from haxe_3.3-windowsservercore/Dockerfile
rename to haxe_3.3-windowsservercore-ltsc2016/Dockerfile
index 22e0c0b..9a81567 100644
--- a/haxe_3.3-windowsservercore/Dockerfile
+++ b/haxe_3.3-windowsservercore-ltsc2016/Dockerfile
@@ -20,6 +20,58 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
+# install Amazon Root CA (expires in 2037), which allows haxelib to talk to https://lib.haxe.org
+RUN $cert = \"-----BEGIN CERTIFICATE-----`n\
+MIIEkjCCA3qgAwIBAgITBn+USionzfP6wq4rAfkI7rnExjANBgkqhkiG9w0BAQsF`n\
+ADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNj`n\
+b3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4x`n\
+OzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1`n\
+dGhvcml0eSAtIEcyMB4XDTE1MDUyNTEyMDAwMFoXDTM3MTIzMTAxMDAwMFowOTEL`n\
+MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv`n\
+b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj`n\
+ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM`n\
+9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw`n\
+IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6`n\
+VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L`n\
+93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm`n\
+jgSubJrIqg0CAwEAAaOCATEwggEtMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/`n\
+BAQDAgGGMB0GA1UdDgQWBBSEGMyFNOy8DJSULghZnMeyEE4KCDAfBgNVHSMEGDAW`n\
+gBScXwDfqgHXMCs4iKK4bUqc8hGRgzB4BggrBgEFBQcBAQRsMGowLgYIKwYBBQUH`n\
+MAGGImh0dHA6Ly9vY3NwLnJvb3RnMi5hbWF6b250cnVzdC5jb20wOAYIKwYBBQUH`n\
+MAKGLGh0dHA6Ly9jcnQucm9vdGcyLmFtYXpvbnRydXN0LmNvbS9yb290ZzIuY2Vy`n\
+MD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly9jcmwucm9vdGcyLmFtYXpvbnRydXN0`n\
+LmNvbS9yb290ZzIuY3JsMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsF`n\
+AAOCAQEAYjdCXLwQtT6LLOkMm2xF4gcAevnFWAu5CIw+7bMlPLVvUOTNNWqnkzSW`n\
+MiGpSESrnO09tKpzbeR/FoCJbM8oAxiDR3mjEH4wW6w7sGDgd9QIpuEdfF7Au/ma`n\
+eyKdpwAJfqxGF4PcnCZXmTA5YpaP7dreqsXMGz7KQ2hsVxa81Q4gLv7/wmpdLqBK`n\
+bRRYh5TmOTFffHPLkIhqhBGWJ6bt2YFGpn6jcgAKUj6DiAdjd4lpFw85hdKrCEVN`n\
+0FE6/V1dN2RMfjCyVSRCnTawXZwXgWHxyvkQAiSr6w10kY17RSlQOYiypok1JR4U`n\
+akcjMS9cmvqtmg5iUaQqqcT5NJ0hGA==`n\
+-----END CERTIFICATE-----\";\
+	Set-Content -Path C:\amazon.cer -Value $cert; \
+	Import-Certificate -FilePath C:\amazon.cer -CertStoreLocation Cert:\LocalMachine\Root\; \
+	Remove-Item -Path C:\amazon.cer;
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +125,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.3.0-rc1/h
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
diff --git a/haxe_3.4-alpine/Dockerfile b/haxe_3.4-alpine/Dockerfile
index 6bee61d..6f52e8f 100644
--- a/haxe_3.4-alpine/Dockerfile
+++ b/haxe_3.4-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.9
+FROM alpine:3.10
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
diff --git a/haxe_3.4-alpine3.6/Dockerfile b/haxe_3.4-alpine3.6/Dockerfile
deleted file mode 100644
index 67dc2e2..0000000
diff --git a/haxe_3.4-alpine/Dockerfile b/haxe_3.4-alpine3.9/Dockerfile
similarity index 100%
copy from haxe_3.4-alpine/Dockerfile
copy to haxe_3.4-alpine3.9/Dockerfile
diff --git a/haxe_latest/Dockerfile b/haxe_3.4-buster/Dockerfile
similarity index 96%
copy from haxe_latest/Dockerfile
copy to haxe_3.4-buster/Dockerfile
index f298396..67e9faf 100644
--- a/haxe_latest/Dockerfile
+++ b/haxe_3.4-buster/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:stretch-scm
+FROM buildpack-deps:buster-scm
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
@@ -14,10 +14,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		libgc1c2 \
 		zlib1g \
 		libpcre3 \
-		libmariadb2 \
+		libmariadb3 \
 		libsqlite3-0 \
-		libmbedcrypto0 \
-		libmbedtls10 \
+		libmbedcrypto3 \
+		libmbedtls12 \
 		libmbedx509-0 \
 	&& rm -rf /var/lib/apt/lists/*
 
diff --git a/haxe_latest/Dockerfile b/haxe_3.4-stretch/Dockerfile
similarity index 100%
rename from haxe_latest/Dockerfile
rename to haxe_3.4-stretch/Dockerfile
diff --git a/haxe_3.4-windowsservercore/Dockerfile b/haxe_3.4-windowsservercore-1803/Dockerfile
similarity index 53%
copy from haxe_3.4-windowsservercore/Dockerfile
copy to haxe_3.4-windowsservercore-1803/Dockerfile
index 5323e67..a1cabe9 100644
--- a/haxe_3.4-windowsservercore/Dockerfile
+++ b/haxe_3.4-windowsservercore-1803/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2016
+FROM mcr.microsoft.com/windows/servercore:1803
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
@@ -20,6 +20,58 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
+# install Amazon Root CA (expires in 2037), which allows haxelib to talk to https://lib.haxe.org
+RUN $cert = \"-----BEGIN CERTIFICATE-----`n\
+MIIEkjCCA3qgAwIBAgITBn+USionzfP6wq4rAfkI7rnExjANBgkqhkiG9w0BAQsF`n\
+ADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNj`n\
+b3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4x`n\
+OzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1`n\
+dGhvcml0eSAtIEcyMB4XDTE1MDUyNTEyMDAwMFoXDTM3MTIzMTAxMDAwMFowOTEL`n\
+MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv`n\
+b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj`n\
+ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM`n\
+9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw`n\
+IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6`n\
+VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L`n\
+93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm`n\
+jgSubJrIqg0CAwEAAaOCATEwggEtMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/`n\
+BAQDAgGGMB0GA1UdDgQWBBSEGMyFNOy8DJSULghZnMeyEE4KCDAfBgNVHSMEGDAW`n\
+gBScXwDfqgHXMCs4iKK4bUqc8hGRgzB4BggrBgEFBQcBAQRsMGowLgYIKwYBBQUH`n\
+MAGGImh0dHA6Ly9vY3NwLnJvb3RnMi5hbWF6b250cnVzdC5jb20wOAYIKwYBBQUH`n\
+MAKGLGh0dHA6Ly9jcnQucm9vdGcyLmFtYXpvbnRydXN0LmNvbS9yb290ZzIuY2Vy`n\
+MD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly9jcmwucm9vdGcyLmFtYXpvbnRydXN0`n\
+LmNvbS9yb290ZzIuY3JsMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsF`n\
+AAOCAQEAYjdCXLwQtT6LLOkMm2xF4gcAevnFWAu5CIw+7bMlPLVvUOTNNWqnkzSW`n\
+MiGpSESrnO09tKpzbeR/FoCJbM8oAxiDR3mjEH4wW6w7sGDgd9QIpuEdfF7Au/ma`n\
+eyKdpwAJfqxGF4PcnCZXmTA5YpaP7dreqsXMGz7KQ2hsVxa81Q4gLv7/wmpdLqBK`n\
+bRRYh5TmOTFffHPLkIhqhBGWJ6bt2YFGpn6jcgAKUj6DiAdjd4lpFw85hdKrCEVN`n\
+0FE6/V1dN2RMfjCyVSRCnTawXZwXgWHxyvkQAiSr6w10kY17RSlQOYiypok1JR4U`n\
+akcjMS9cmvqtmg5iUaQqqcT5NJ0hGA==`n\
+-----END CERTIFICATE-----\";\
+	Set-Content -Path C:\amazon.cer -Value $cert; \
+	Import-Certificate -FilePath C:\amazon.cer -CertStoreLocation Cert:\LocalMachine\Root\; \
+	Remove-Item -Path C:\amazon.cer;
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +125,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.4.7/haxe-
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
diff --git a/haxe_3.4-windowsservercore/Dockerfile b/haxe_3.4-windowsservercore-ltsc2016/Dockerfile
similarity index 54%
rename from haxe_3.4-windowsservercore/Dockerfile
rename to haxe_3.4-windowsservercore-ltsc2016/Dockerfile
index 5323e67..642f001 100644
--- a/haxe_3.4-windowsservercore/Dockerfile
+++ b/haxe_3.4-windowsservercore-ltsc2016/Dockerfile
@@ -20,6 +20,58 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
+# install Amazon Root CA (expires in 2037), which allows haxelib to talk to https://lib.haxe.org
+RUN $cert = \"-----BEGIN CERTIFICATE-----`n\
+MIIEkjCCA3qgAwIBAgITBn+USionzfP6wq4rAfkI7rnExjANBgkqhkiG9w0BAQsF`n\
+ADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNj`n\
+b3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4x`n\
+OzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1`n\
+dGhvcml0eSAtIEcyMB4XDTE1MDUyNTEyMDAwMFoXDTM3MTIzMTAxMDAwMFowOTEL`n\
+MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv`n\
+b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj`n\
+ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM`n\
+9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw`n\
+IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6`n\
+VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L`n\
+93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm`n\
+jgSubJrIqg0CAwEAAaOCATEwggEtMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/`n\
+BAQDAgGGMB0GA1UdDgQWBBSEGMyFNOy8DJSULghZnMeyEE4KCDAfBgNVHSMEGDAW`n\
+gBScXwDfqgHXMCs4iKK4bUqc8hGRgzB4BggrBgEFBQcBAQRsMGowLgYIKwYBBQUH`n\
+MAGGImh0dHA6Ly9vY3NwLnJvb3RnMi5hbWF6b250cnVzdC5jb20wOAYIKwYBBQUH`n\
+MAKGLGh0dHA6Ly9jcnQucm9vdGcyLmFtYXpvbnRydXN0LmNvbS9yb290ZzIuY2Vy`n\
+MD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly9jcmwucm9vdGcyLmFtYXpvbnRydXN0`n\
+LmNvbS9yb290ZzIuY3JsMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsF`n\
+AAOCAQEAYjdCXLwQtT6LLOkMm2xF4gcAevnFWAu5CIw+7bMlPLVvUOTNNWqnkzSW`n\
+MiGpSESrnO09tKpzbeR/FoCJbM8oAxiDR3mjEH4wW6w7sGDgd9QIpuEdfF7Au/ma`n\
+eyKdpwAJfqxGF4PcnCZXmTA5YpaP7dreqsXMGz7KQ2hsVxa81Q4gLv7/wmpdLqBK`n\
+bRRYh5TmOTFffHPLkIhqhBGWJ6bt2YFGpn6jcgAKUj6DiAdjd4lpFw85hdKrCEVN`n\
+0FE6/V1dN2RMfjCyVSRCnTawXZwXgWHxyvkQAiSr6w10kY17RSlQOYiypok1JR4U`n\
+akcjMS9cmvqtmg5iUaQqqcT5NJ0hGA==`n\
+-----END CERTIFICATE-----\";\
+	Set-Content -Path C:\amazon.cer -Value $cert; \
+	Import-Certificate -FilePath C:\amazon.cer -CertStoreLocation Cert:\LocalMachine\Root\; \
+	Remove-Item -Path C:\amazon.cer;
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +125,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.4.7/haxe-
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
diff --git a/haxe_4.0-alpine/Dockerfile b/haxe_4.0-alpine/Dockerfile
index 1a23bd0..70eb338 100644
--- a/haxe_4.0-alpine/Dockerfile
+++ b/haxe_4.0-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.9
+FROM alpine:3.10
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
diff --git a/haxe_4.0-alpine3.6/Dockerfile b/haxe_4.0-alpine3.6/Dockerfile
deleted file mode 100644
index dc6643b..0000000
diff --git a/haxe_4.0-alpine/Dockerfile b/haxe_4.0-alpine3.9/Dockerfile
similarity index 100%
copy from haxe_4.0-alpine/Dockerfile
copy to haxe_4.0-alpine3.9/Dockerfile
diff --git a/haxe_4.0/Dockerfile b/haxe_4.0-buster/Dockerfile
similarity index 88%
copy from haxe_4.0/Dockerfile
copy to haxe_4.0-buster/Dockerfile
index 7eb8c25..3331b4e 100644
--- a/haxe_4.0/Dockerfile
+++ b/haxe_4.0-buster/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:stretch-scm
+FROM buildpack-deps:buster-scm
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
@@ -14,10 +14,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		libgc1c2 \
 		zlib1g \
 		libpcre3 \
-		libmariadb2 \
+		libmariadb3 \
 		libsqlite3-0 \
-		libmbedcrypto0 \
-		libmbedtls10 \
+		libmbedcrypto3 \
+		libmbedtls12 \
 		libmbedx509-0 \
 	&& rm -rf /var/lib/apt/lists/*
 
@@ -68,9 +68,10 @@ RUN set -ex \
 		libxml-light-ocaml-dev \
 		\
 		opam \
-		aspcud \
+		mccs \
 		m4 \
 		unzip \
+		pkg-config \
 		\
 	' \
 	&& git clone --recursive --depth 1 --branch 4.0.0-rc.3 "https://github.com/HaxeFoundation/haxe.git" /usr/src/haxe \
@@ -78,9 +79,9 @@ RUN set -ex \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
 	\
 	\
-	&& opam init --comp system \
-	&& eval `opam config env` \
-	&& make opam_install \
+	&& opam init --disable-sandboxing \
+	&& eval `opam env` \
+	&& ( [ -f /usr/src/haxe/opam ] && opam install /usr/src/haxe --deps-only --yes || make opam_install ) \
 	\
 	&& make all tools \
 	&& mkdir -p /usr/local/bin \
diff --git a/haxe_4.0/Dockerfile b/haxe_4.0-stretch/Dockerfile
similarity index 100%
rename from haxe_4.0/Dockerfile
rename to haxe_4.0-stretch/Dockerfile
diff --git a/haxe_4.0-windowsservercore/Dockerfile b/haxe_4.0-windowsservercore-1803/Dockerfile
similarity index 53%
copy from haxe_4.0-windowsservercore/Dockerfile
copy to haxe_4.0-windowsservercore-1803/Dockerfile
index a1be233..9710cfc 100644
--- a/haxe_4.0-windowsservercore/Dockerfile
+++ b/haxe_4.0-windowsservercore-1803/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2016
+FROM mcr.microsoft.com/windows/servercore:1803
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
@@ -20,6 +20,58 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
+# install Amazon Root CA (expires in 2037), which allows haxelib to talk to https://lib.haxe.org
+RUN $cert = \"-----BEGIN CERTIFICATE-----`n\
+MIIEkjCCA3qgAwIBAgITBn+USionzfP6wq4rAfkI7rnExjANBgkqhkiG9w0BAQsF`n\
+ADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNj`n\
+b3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4x`n\
+OzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1`n\
+dGhvcml0eSAtIEcyMB4XDTE1MDUyNTEyMDAwMFoXDTM3MTIzMTAxMDAwMFowOTEL`n\
+MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv`n\
+b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj`n\
+ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM`n\
+9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw`n\
+IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6`n\
+VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L`n\
+93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm`n\
+jgSubJrIqg0CAwEAAaOCATEwggEtMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/`n\
+BAQDAgGGMB0GA1UdDgQWBBSEGMyFNOy8DJSULghZnMeyEE4KCDAfBgNVHSMEGDAW`n\
+gBScXwDfqgHXMCs4iKK4bUqc8hGRgzB4BggrBgEFBQcBAQRsMGowLgYIKwYBBQUH`n\
+MAGGImh0dHA6Ly9vY3NwLnJvb3RnMi5hbWF6b250cnVzdC5jb20wOAYIKwYBBQUH`n\
+MAKGLGh0dHA6Ly9jcnQucm9vdGcyLmFtYXpvbnRydXN0LmNvbS9yb290ZzIuY2Vy`n\
+MD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly9jcmwucm9vdGcyLmFtYXpvbnRydXN0`n\
+LmNvbS9yb290ZzIuY3JsMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsF`n\
+AAOCAQEAYjdCXLwQtT6LLOkMm2xF4gcAevnFWAu5CIw+7bMlPLVvUOTNNWqnkzSW`n\
+MiGpSESrnO09tKpzbeR/FoCJbM8oAxiDR3mjEH4wW6w7sGDgd9QIpuEdfF7Au/ma`n\
+eyKdpwAJfqxGF4PcnCZXmTA5YpaP7dreqsXMGz7KQ2hsVxa81Q4gLv7/wmpdLqBK`n\
+bRRYh5TmOTFffHPLkIhqhBGWJ6bt2YFGpn6jcgAKUj6DiAdjd4lpFw85hdKrCEVN`n\
+0FE6/V1dN2RMfjCyVSRCnTawXZwXgWHxyvkQAiSr6w10kY17RSlQOYiypok1JR4U`n\
+akcjMS9cmvqtmg5iUaQqqcT5NJ0hGA==`n\
+-----END CERTIFICATE-----\";\
+	Set-Content -Path C:\amazon.cer -Value $cert; \
+	Import-Certificate -FilePath C:\amazon.cer -CertStoreLocation Cert:\LocalMachine\Root\; \
+	Remove-Item -Path C:\amazon.cer;
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +125,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/4.0.0-rc.3/
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
diff --git a/haxe_4.0-windowsservercore/Dockerfile b/haxe_4.0-windowsservercore-ltsc2016/Dockerfile
similarity index 54%
rename from haxe_4.0-windowsservercore/Dockerfile
rename to haxe_4.0-windowsservercore-ltsc2016/Dockerfile
index a1be233..7c8456c 100644
--- a/haxe_4.0-windowsservercore/Dockerfile
+++ b/haxe_4.0-windowsservercore-ltsc2016/Dockerfile
@@ -20,6 +20,58 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
+# install Amazon Root CA (expires in 2037), which allows haxelib to talk to https://lib.haxe.org
+RUN $cert = \"-----BEGIN CERTIFICATE-----`n\
+MIIEkjCCA3qgAwIBAgITBn+USionzfP6wq4rAfkI7rnExjANBgkqhkiG9w0BAQsF`n\
+ADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNj`n\
+b3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4x`n\
+OzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1`n\
+dGhvcml0eSAtIEcyMB4XDTE1MDUyNTEyMDAwMFoXDTM3MTIzMTAxMDAwMFowOTEL`n\
+MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv`n\
+b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj`n\
+ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM`n\
+9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw`n\
+IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6`n\
+VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L`n\
+93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm`n\
+jgSubJrIqg0CAwEAAaOCATEwggEtMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/`n\
+BAQDAgGGMB0GA1UdDgQWBBSEGMyFNOy8DJSULghZnMeyEE4KCDAfBgNVHSMEGDAW`n\
+gBScXwDfqgHXMCs4iKK4bUqc8hGRgzB4BggrBgEFBQcBAQRsMGowLgYIKwYBBQUH`n\
+MAGGImh0dHA6Ly9vY3NwLnJvb3RnMi5hbWF6b250cnVzdC5jb20wOAYIKwYBBQUH`n\
+MAKGLGh0dHA6Ly9jcnQucm9vdGcyLmFtYXpvbnRydXN0LmNvbS9yb290ZzIuY2Vy`n\
+MD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly9jcmwucm9vdGcyLmFtYXpvbnRydXN0`n\
+LmNvbS9yb290ZzIuY3JsMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsF`n\
+AAOCAQEAYjdCXLwQtT6LLOkMm2xF4gcAevnFWAu5CIw+7bMlPLVvUOTNNWqnkzSW`n\
+MiGpSESrnO09tKpzbeR/FoCJbM8oAxiDR3mjEH4wW6w7sGDgd9QIpuEdfF7Au/ma`n\
+eyKdpwAJfqxGF4PcnCZXmTA5YpaP7dreqsXMGz7KQ2hsVxa81Q4gLv7/wmpdLqBK`n\
+bRRYh5TmOTFffHPLkIhqhBGWJ6bt2YFGpn6jcgAKUj6DiAdjd4lpFw85hdKrCEVN`n\
+0FE6/V1dN2RMfjCyVSRCnTawXZwXgWHxyvkQAiSr6w10kY17RSlQOYiypok1JR4U`n\
+akcjMS9cmvqtmg5iUaQqqcT5NJ0hGA==`n\
+-----END CERTIFICATE-----\";\
+	Set-Content -Path C:\amazon.cer -Value $cert; \
+	Import-Certificate -FilePath C:\amazon.cer -CertStoreLocation Cert:\LocalMachine\Root\; \
+	Remove-Item -Path C:\amazon.cer;
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +125,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/4.0.0-rc.3/
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 

@yosifkit
Copy link
Member

Where does this certificate come from? I can't find in on https://www.amazontrust.com nor its fingerprint in the certificate chain for lib.haxe.org.

@andyli
Copy link
Contributor Author

andyli commented Jul 12, 2019

I just grab it from Chrome opening https://lib.haxe.org

cert

@tianon
Copy link
Member

tianon commented Jul 12, 2019 via email

@andyli
Copy link
Contributor Author

andyli commented Jul 12, 2019

Wouldn't/shouldn't that already be installed in the image?

I don't know but I got Error: X509 - Certificate verification failed, e.g. CRL, CA or signature check failed in my test build if I don't install any cert manually.

How are users expected to verify this if they're curious what this embedded certificate is?

Would it be better if I download the pem instead of hardcoding it?

# install Amazon Root CA 1, which allows haxelib to talk to https://lib.haxe.org
RUN $url = 'https://www.amazontrust.com/repository/AmazonRootCA1.pem'; \
	Write-Host ('Downloading {0} ...' -f $url); \
	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
	Invoke-WebRequest -Uri $url -OutFile AmazonRootCA1.pem; \
	Import-Certificate -FilePath AmazonRootCA1.pem -CertStoreLocation Cert:\LocalMachine\Root\; \
	Remove-Item -Path AmazonRootCA1.pem;

The Thumbprint is indeed different from the current hardcoded one, which I got from Chrome and export with "base-64 encoded x.509" format. Maybe Thumbprint is affected by the format?

Anyway, I've checked the pem downloaded from https://www.amazontrust.com would also work, so I can use that instead...

@tianon
Copy link
Member

tianon commented Jul 12, 2019 via email

@andyli
Copy link
Contributor Author

andyli commented Jul 12, 2019

Oh... It looks like it's the root cause. haxelib works after I added the RUN step as follows

RUN (New-Object System.Net.WebClient).DownloadString('https://lib.haxe.org') >$null

So, somehow haxelib doesn't trigger Windows to fetch CA certs. I will see if it can be fixed upstream, but I will use the workaround for now.

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 25d4d0b..ee0e07e 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,57 +1,74 @@
-haxe:3.1 @ amd64
-haxe:3.1 @ arm32v7
-haxe:3.1 @ arm64v8
 haxe:3.1-jessie @ amd64
-haxe:3.1-windowsservercore @ windows-amd64
-haxe:3.2 @ amd64
-haxe:3.2 @ arm32v7
-haxe:3.2 @ arm64v8
-haxe:3.2-alpine3.6 @ amd64
-haxe:3.2-alpine3.6 @ arm64v8
+haxe:3.1-stretch @ amd64
+haxe:3.1-stretch @ arm32v7
+haxe:3.1-stretch @ arm64v8
+haxe:3.1-windowsservercore-1803 @ windows-amd64
+haxe:3.1-windowsservercore-ltsc2016 @ windows-amd64
 haxe:3.2-alpine3.7 @ amd64
 haxe:3.2-alpine3.7 @ arm64v8
 haxe:3.2-alpine3.8 @ amd64
 haxe:3.2-alpine3.8 @ arm64v8
+haxe:3.2-alpine3.9 @ amd64
+haxe:3.2-alpine3.9 @ arm64v8
 haxe:3.2-alpine @ amd64
 haxe:3.2-alpine @ arm64v8
+haxe:3.2-buster @ amd64
+haxe:3.2-buster @ arm32v7
+haxe:3.2-buster @ arm64v8
 haxe:3.2-jessie @ amd64
-haxe:3.2-windowsservercore @ windows-amd64
-haxe:3.3 @ amd64
-haxe:3.3 @ arm32v7
-haxe:3.3 @ arm64v8
-haxe:3.3-alpine3.6 @ amd64
-haxe:3.3-alpine3.6 @ arm64v8
+haxe:3.2-stretch @ amd64
+haxe:3.2-stretch @ arm32v7
+haxe:3.2-stretch @ arm64v8
+haxe:3.2-windowsservercore-1803 @ windows-amd64
+haxe:3.2-windowsservercore-ltsc2016 @ windows-amd64
 haxe:3.3-alpine3.7 @ amd64
 haxe:3.3-alpine3.7 @ arm64v8
 haxe:3.3-alpine3.8 @ amd64
 haxe:3.3-alpine3.8 @ arm64v8
+haxe:3.3-alpine3.9 @ amd64
+haxe:3.3-alpine3.9 @ arm64v8
 haxe:3.3-alpine @ amd64
 haxe:3.3-alpine @ arm64v8
+haxe:3.3-buster @ amd64
+haxe:3.3-buster @ arm32v7
+haxe:3.3-buster @ arm64v8
 haxe:3.3-jessie @ amd64
-haxe:3.3-windowsservercore @ windows-amd64
-haxe:3.4-alpine3.6 @ amd64
-haxe:3.4-alpine3.6 @ arm64v8
+haxe:3.3-stretch @ amd64
+haxe:3.3-stretch @ arm32v7
+haxe:3.3-stretch @ arm64v8
+haxe:3.3-windowsservercore-1803 @ windows-amd64
+haxe:3.3-windowsservercore-ltsc2016 @ windows-amd64
 haxe:3.4-alpine3.7 @ amd64
 haxe:3.4-alpine3.7 @ arm64v8
 haxe:3.4-alpine3.8 @ amd64
 haxe:3.4-alpine3.8 @ arm64v8
+haxe:3.4-alpine3.9 @ amd64
+haxe:3.4-alpine3.9 @ arm64v8
 haxe:3.4-alpine @ amd64
 haxe:3.4-alpine @ arm64v8
+haxe:3.4-buster @ amd64
+haxe:3.4-buster @ arm32v7
+haxe:3.4-buster @ arm64v8
 haxe:3.4-jessie @ amd64
-haxe:3.4-windowsservercore @ windows-amd64
-haxe:4.0 @ amd64
-haxe:4.0 @ arm32v7
-haxe:4.0 @ arm64v8
-haxe:4.0-alpine3.6 @ amd64
-haxe:4.0-alpine3.6 @ arm64v8
+haxe:3.4-stretch @ amd64
+haxe:3.4-stretch @ arm32v7
+haxe:3.4-stretch @ arm64v8
+haxe:3.4-windowsservercore-1803 @ windows-amd64
+haxe:3.4-windowsservercore-ltsc2016 @ windows-amd64
 haxe:4.0-alpine3.7 @ amd64
 haxe:4.0-alpine3.7 @ arm64v8
 haxe:4.0-alpine3.8 @ amd64
 haxe:4.0-alpine3.8 @ arm64v8
+haxe:4.0-alpine3.9 @ amd64
+haxe:4.0-alpine3.9 @ arm64v8
 haxe:4.0-alpine @ amd64
 haxe:4.0-alpine @ arm64v8
+haxe:4.0-buster @ amd64
+haxe:4.0-buster @ arm32v7
+haxe:4.0-buster @ arm64v8
 haxe:4.0-jessie @ amd64
-haxe:4.0-windowsservercore @ windows-amd64
-haxe:latest @ amd64
-haxe:latest @ arm32v7
-haxe:latest @ arm64v8
+haxe:4.0-stretch @ amd64
+haxe:4.0-stretch @ arm32v7
+haxe:4.0-stretch @ arm64v8
+haxe:4.0-windowsservercore-1803 @ windows-amd64
+haxe:4.0-windowsservercore-ltsc2016 @ windows-amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 06ae456..4702d4e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,110 +2,132 @@ haxe:3.1
 haxe:3.1-jessie
 haxe:3.1-stretch
 haxe:3.1-windowsservercore
+haxe:3.1-windowsservercore-1803
 haxe:3.1-windowsservercore-ltsc2016
 haxe:3.1.3
 haxe:3.1.3-jessie
 haxe:3.1.3-stretch
 haxe:3.1.3-windowsservercore
+haxe:3.1.3-windowsservercore-1803
 haxe:3.1.3-windowsservercore-ltsc2016
 haxe:3.2
 haxe:3.2-alpine
-haxe:3.2-alpine3.6
 haxe:3.2-alpine3.7
 haxe:3.2-alpine3.8
 haxe:3.2-alpine3.9
+haxe:3.2-alpine3.10
+haxe:3.2-buster
 haxe:3.2-jessie
 haxe:3.2-stretch
 haxe:3.2-windowsservercore
+haxe:3.2-windowsservercore-1803
 haxe:3.2-windowsservercore-ltsc2016
 haxe:3.2.1
 haxe:3.2.1-alpine
-haxe:3.2.1-alpine3.6
 haxe:3.2.1-alpine3.7
 haxe:3.2.1-alpine3.8
 haxe:3.2.1-alpine3.9
+haxe:3.2.1-alpine3.10
+haxe:3.2.1-buster
 haxe:3.2.1-jessie
 haxe:3.2.1-stretch
 haxe:3.2.1-windowsservercore
+haxe:3.2.1-windowsservercore-1803
 haxe:3.2.1-windowsservercore-ltsc2016
 haxe:3.3
 haxe:3.3-alpine
-haxe:3.3-alpine3.6
 haxe:3.3-alpine3.7
 haxe:3.3-alpine3.8
 haxe:3.3-alpine3.9
+haxe:3.3-alpine3.10
+haxe:3.3-buster
 haxe:3.3-jessie
 haxe:3.3-stretch
 haxe:3.3-windowsservercore
+haxe:3.3-windowsservercore-1803
 haxe:3.3-windowsservercore-ltsc2016
 haxe:3.3.0
 haxe:3.3.0-alpine
-haxe:3.3.0-alpine3.6
 haxe:3.3.0-alpine3.7
 haxe:3.3.0-alpine3.8
 haxe:3.3.0-alpine3.9
+haxe:3.3.0-alpine3.10
+haxe:3.3.0-buster
 haxe:3.3.0-jessie
 haxe:3.3.0-rc.1
 haxe:3.3.0-rc.1-alpine
-haxe:3.3.0-rc.1-alpine3.6
 haxe:3.3.0-rc.1-alpine3.7
 haxe:3.3.0-rc.1-alpine3.8
 haxe:3.3.0-rc.1-alpine3.9
+haxe:3.3.0-rc.1-alpine3.10
+haxe:3.3.0-rc.1-buster
 haxe:3.3.0-rc.1-jessie
 haxe:3.3.0-rc.1-stretch
 haxe:3.3.0-rc.1-windowsservercore
+haxe:3.3.0-rc.1-windowsservercore-1803
 haxe:3.3.0-rc.1-windowsservercore-ltsc2016
 haxe:3.3.0-stretch
 haxe:3.3.0-windowsservercore
+haxe:3.3.0-windowsservercore-1803
 haxe:3.3.0-windowsservercore-ltsc2016
 haxe:3.4
 haxe:3.4-alpine
-haxe:3.4-alpine3.6
 haxe:3.4-alpine3.7
 haxe:3.4-alpine3.8
 haxe:3.4-alpine3.9
+haxe:3.4-alpine3.10
+haxe:3.4-buster
 haxe:3.4-jessie
 haxe:3.4-stretch
 haxe:3.4-windowsservercore
+haxe:3.4-windowsservercore-1803
 haxe:3.4-windowsservercore-ltsc2016
 haxe:3.4.7
 haxe:3.4.7-alpine
-haxe:3.4.7-alpine3.6
 haxe:3.4.7-alpine3.7
 haxe:3.4.7-alpine3.8
 haxe:3.4.7-alpine3.9
+haxe:3.4.7-alpine3.10
+haxe:3.4.7-buster
 haxe:3.4.7-jessie
 haxe:3.4.7-stretch
 haxe:3.4.7-windowsservercore
+haxe:3.4.7-windowsservercore-1803
 haxe:3.4.7-windowsservercore-ltsc2016
 haxe:4.0
 haxe:4.0-alpine
-haxe:4.0-alpine3.6
 haxe:4.0-alpine3.7
 haxe:4.0-alpine3.8
 haxe:4.0-alpine3.9
+haxe:4.0-alpine3.10
+haxe:4.0-buster
 haxe:4.0-jessie
 haxe:4.0-stretch
 haxe:4.0-windowsservercore
+haxe:4.0-windowsservercore-1803
 haxe:4.0-windowsservercore-ltsc2016
 haxe:4.0.0
 haxe:4.0.0-alpine
-haxe:4.0.0-alpine3.6
 haxe:4.0.0-alpine3.7
 haxe:4.0.0-alpine3.8
 haxe:4.0.0-alpine3.9
+haxe:4.0.0-alpine3.10
+haxe:4.0.0-buster
 haxe:4.0.0-jessie
 haxe:4.0.0-rc.3
 haxe:4.0.0-rc.3-alpine
-haxe:4.0.0-rc.3-alpine3.6
 haxe:4.0.0-rc.3-alpine3.7
 haxe:4.0.0-rc.3-alpine3.8
 haxe:4.0.0-rc.3-alpine3.9
+haxe:4.0.0-rc.3-alpine3.10
+haxe:4.0.0-rc.3-buster
 haxe:4.0.0-rc.3-jessie
 haxe:4.0.0-rc.3-stretch
 haxe:4.0.0-rc.3-windowsservercore
+haxe:4.0.0-rc.3-windowsservercore-1803
 haxe:4.0.0-rc.3-windowsservercore-ltsc2016
 haxe:4.0.0-stretch
 haxe:4.0.0-windowsservercore
+haxe:4.0.0-windowsservercore-1803
 haxe:4.0.0-windowsservercore-ltsc2016
 haxe:latest
diff --git a/_bashbrew-shared-tags b/_bashbrew-shared-tags
index e69de29..1acc565 100644
--- a/_bashbrew-shared-tags
+++ b/_bashbrew-shared-tags
@@ -0,0 +1,25 @@
+haxe:3.1 -- haxe:3.1-windowsservercore-1803, haxe:3.1-windowsservercore-ltsc2016
+haxe:3.1-windowsservercore -- haxe:3.1-windowsservercore-1803, haxe:3.1-windowsservercore-ltsc2016
+haxe:3.1.3 -- haxe:3.1-windowsservercore-1803, haxe:3.1-windowsservercore-ltsc2016
+haxe:3.1.3-windowsservercore -- haxe:3.1-windowsservercore-1803, haxe:3.1-windowsservercore-ltsc2016
+haxe:3.2 -- haxe:3.2-buster, haxe:3.2-windowsservercore-1803, haxe:3.2-windowsservercore-ltsc2016
+haxe:3.2-windowsservercore -- haxe:3.2-windowsservercore-1803, haxe:3.2-windowsservercore-ltsc2016
+haxe:3.2.1 -- haxe:3.2-buster, haxe:3.2-windowsservercore-1803, haxe:3.2-windowsservercore-ltsc2016
+haxe:3.2.1-windowsservercore -- haxe:3.2-windowsservercore-1803, haxe:3.2-windowsservercore-ltsc2016
+haxe:3.3 -- haxe:3.3-buster, haxe:3.3-windowsservercore-1803, haxe:3.3-windowsservercore-ltsc2016
+haxe:3.3-windowsservercore -- haxe:3.3-windowsservercore-1803, haxe:3.3-windowsservercore-ltsc2016
+haxe:3.3.0 -- haxe:3.3-buster, haxe:3.3-windowsservercore-1803, haxe:3.3-windowsservercore-ltsc2016
+haxe:3.3.0-rc.1 -- haxe:3.3-buster, haxe:3.3-windowsservercore-1803, haxe:3.3-windowsservercore-ltsc2016
+haxe:3.3.0-rc.1-windowsservercore -- haxe:3.3-windowsservercore-1803, haxe:3.3-windowsservercore-ltsc2016
+haxe:3.3.0-windowsservercore -- haxe:3.3-windowsservercore-1803, haxe:3.3-windowsservercore-ltsc2016
+haxe:3.4 -- haxe:3.4-buster, haxe:3.4-windowsservercore-1803, haxe:3.4-windowsservercore-ltsc2016
+haxe:3.4-windowsservercore -- haxe:3.4-windowsservercore-1803, haxe:3.4-windowsservercore-ltsc2016
+haxe:3.4.7 -- haxe:3.4-buster, haxe:3.4-windowsservercore-1803, haxe:3.4-windowsservercore-ltsc2016
+haxe:3.4.7-windowsservercore -- haxe:3.4-windowsservercore-1803, haxe:3.4-windowsservercore-ltsc2016
+haxe:4.0 -- haxe:4.0-buster, haxe:4.0-windowsservercore-1803, haxe:4.0-windowsservercore-ltsc2016
+haxe:4.0-windowsservercore -- haxe:4.0-windowsservercore-1803, haxe:4.0-windowsservercore-ltsc2016
+haxe:4.0.0 -- haxe:4.0-buster, haxe:4.0-windowsservercore-1803, haxe:4.0-windowsservercore-ltsc2016
+haxe:4.0.0-rc.3 -- haxe:4.0-buster, haxe:4.0-windowsservercore-1803, haxe:4.0-windowsservercore-ltsc2016
+haxe:4.0.0-rc.3-windowsservercore -- haxe:4.0-windowsservercore-1803, haxe:4.0-windowsservercore-ltsc2016
+haxe:4.0.0-windowsservercore -- haxe:4.0-windowsservercore-1803, haxe:4.0-windowsservercore-ltsc2016
+haxe:latest -- haxe:3.4-buster, haxe:3.4-windowsservercore-1803, haxe:3.4-windowsservercore-ltsc2016
diff --git a/haxe_3.1/Dockerfile b/haxe_3.1-stretch/Dockerfile
similarity index 100%
rename from haxe_3.1/Dockerfile
rename to haxe_3.1-stretch/Dockerfile
diff --git a/haxe_3.1-windowsservercore/Dockerfile b/haxe_3.1-windowsservercore-1803/Dockerfile
similarity index 75%
copy from haxe_3.1-windowsservercore/Dockerfile
copy to haxe_3.1-windowsservercore-1803/Dockerfile
index 01b6ac7..54cfa26 100644
--- a/haxe_3.1-windowsservercore/Dockerfile
+++ b/haxe_3.1-windowsservercore-1803/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2016
+FROM mcr.microsoft.com/windows/servercore:1803
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
@@ -20,6 +20,26 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +93,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.1.3/haxe-
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
@@ -84,4 +105,7 @@ RUN $newPath = ('{0}\Users\{1}' -f $env:HOMEDRIVE, $env:USERNAME); \
 	Write-Host ('Updating HOMEPATH: {0}' -f $newPath); \
 	[Environment]::SetEnvironmentVariable('HOMEPATH', $newPath, [EnvironmentVariableTarget]::Machine);
 
+# Make a request to lib.haxe.org once such that Windows fetches the cert, which can then used by haxelib.
+RUN (New-Object System.Net.WebClient).DownloadString('https://lib.haxe.org') >$null
+
 CMD ["haxe"]
diff --git a/haxe_3.1-windowsservercore/Dockerfile b/haxe_3.1-windowsservercore-ltsc2016/Dockerfile
similarity index 76%
rename from haxe_3.1-windowsservercore/Dockerfile
rename to haxe_3.1-windowsservercore-ltsc2016/Dockerfile
index 01b6ac7..7dd3c49 100644
--- a/haxe_3.1-windowsservercore/Dockerfile
+++ b/haxe_3.1-windowsservercore-ltsc2016/Dockerfile
@@ -20,6 +20,26 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +93,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.1.3/haxe-
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
@@ -84,4 +105,7 @@ RUN $newPath = ('{0}\Users\{1}' -f $env:HOMEDRIVE, $env:USERNAME); \
 	Write-Host ('Updating HOMEPATH: {0}' -f $newPath); \
 	[Environment]::SetEnvironmentVariable('HOMEPATH', $newPath, [EnvironmentVariableTarget]::Machine);
 
+# Make a request to lib.haxe.org once such that Windows fetches the cert, which can then used by haxelib.
+RUN (New-Object System.Net.WebClient).DownloadString('https://lib.haxe.org') >$null
+
 CMD ["haxe"]
diff --git a/haxe_3.2-alpine/Dockerfile b/haxe_3.2-alpine/Dockerfile
index 5b5c0e1..33f8dc4 100644
--- a/haxe_3.2-alpine/Dockerfile
+++ b/haxe_3.2-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.9
+FROM alpine:3.10
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
diff --git a/haxe_3.2-alpine3.6/Dockerfile b/haxe_3.2-alpine3.6/Dockerfile
deleted file mode 100644
index 11b40c0..0000000
diff --git a/haxe_3.2-alpine/Dockerfile b/haxe_3.2-alpine3.9/Dockerfile
similarity index 100%
copy from haxe_3.2-alpine/Dockerfile
copy to haxe_3.2-alpine3.9/Dockerfile
diff --git a/haxe_3.2/Dockerfile b/haxe_3.2-buster/Dockerfile
similarity index 96%
copy from haxe_3.2/Dockerfile
copy to haxe_3.2-buster/Dockerfile
index 877849f..61f5687 100644
--- a/haxe_3.2/Dockerfile
+++ b/haxe_3.2-buster/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:stretch-scm
+FROM buildpack-deps:buster-scm
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
@@ -14,10 +14,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		libgc1c2 \
 		zlib1g \
 		libpcre3 \
-		libmariadb2 \
+		libmariadb3 \
 		libsqlite3-0 \
-		libmbedcrypto0 \
-		libmbedtls10 \
+		libmbedcrypto3 \
+		libmbedtls12 \
 		libmbedx509-0 \
 	&& rm -rf /var/lib/apt/lists/*
 
diff --git a/haxe_3.2/Dockerfile b/haxe_3.2-stretch/Dockerfile
similarity index 100%
rename from haxe_3.2/Dockerfile
rename to haxe_3.2-stretch/Dockerfile
diff --git a/haxe_3.2-windowsservercore/Dockerfile b/haxe_3.2-windowsservercore-1803/Dockerfile
similarity index 75%
copy from haxe_3.2-windowsservercore/Dockerfile
copy to haxe_3.2-windowsservercore-1803/Dockerfile
index 255e75e..b67172d 100644
--- a/haxe_3.2-windowsservercore/Dockerfile
+++ b/haxe_3.2-windowsservercore-1803/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2016
+FROM mcr.microsoft.com/windows/servercore:1803
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
@@ -20,6 +20,26 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +93,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.2.1/haxe-
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
@@ -84,4 +105,7 @@ RUN $newPath = ('{0}\Users\{1}' -f $env:HOMEDRIVE, $env:USERNAME); \
 	Write-Host ('Updating HOMEPATH: {0}' -f $newPath); \
 	[Environment]::SetEnvironmentVariable('HOMEPATH', $newPath, [EnvironmentVariableTarget]::Machine);
 
+# Make a request to lib.haxe.org once such that Windows fetches the cert, which can then used by haxelib.
+RUN (New-Object System.Net.WebClient).DownloadString('https://lib.haxe.org') >$null
+
 CMD ["haxe"]
diff --git a/haxe_3.2-windowsservercore/Dockerfile b/haxe_3.2-windowsservercore-ltsc2016/Dockerfile
similarity index 76%
rename from haxe_3.2-windowsservercore/Dockerfile
rename to haxe_3.2-windowsservercore-ltsc2016/Dockerfile
index 255e75e..f6ccb95 100644
--- a/haxe_3.2-windowsservercore/Dockerfile
+++ b/haxe_3.2-windowsservercore-ltsc2016/Dockerfile
@@ -20,6 +20,26 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +93,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.2.1/haxe-
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
@@ -84,4 +105,7 @@ RUN $newPath = ('{0}\Users\{1}' -f $env:HOMEDRIVE, $env:USERNAME); \
 	Write-Host ('Updating HOMEPATH: {0}' -f $newPath); \
 	[Environment]::SetEnvironmentVariable('HOMEPATH', $newPath, [EnvironmentVariableTarget]::Machine);
 
+# Make a request to lib.haxe.org once such that Windows fetches the cert, which can then used by haxelib.
+RUN (New-Object System.Net.WebClient).DownloadString('https://lib.haxe.org') >$null
+
 CMD ["haxe"]
diff --git a/haxe_3.3-alpine/Dockerfile b/haxe_3.3-alpine/Dockerfile
index ef8b7da..97a9736 100644
--- a/haxe_3.3-alpine/Dockerfile
+++ b/haxe_3.3-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.9
+FROM alpine:3.10
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
diff --git a/haxe_3.3-alpine3.6/Dockerfile b/haxe_3.3-alpine3.6/Dockerfile
deleted file mode 100644
index cfc3a15..0000000
diff --git a/haxe_3.3-alpine/Dockerfile b/haxe_3.3-alpine3.9/Dockerfile
similarity index 100%
copy from haxe_3.3-alpine/Dockerfile
copy to haxe_3.3-alpine3.9/Dockerfile
diff --git a/haxe_3.3/Dockerfile b/haxe_3.3-buster/Dockerfile
similarity index 96%
copy from haxe_3.3/Dockerfile
copy to haxe_3.3-buster/Dockerfile
index c661713..2730cde 100644
--- a/haxe_3.3/Dockerfile
+++ b/haxe_3.3-buster/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:stretch-scm
+FROM buildpack-deps:buster-scm
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
@@ -14,10 +14,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		libgc1c2 \
 		zlib1g \
 		libpcre3 \
-		libmariadb2 \
+		libmariadb3 \
 		libsqlite3-0 \
-		libmbedcrypto0 \
-		libmbedtls10 \
+		libmbedcrypto3 \
+		libmbedtls12 \
 		libmbedx509-0 \
 	&& rm -rf /var/lib/apt/lists/*
 
diff --git a/haxe_3.3/Dockerfile b/haxe_3.3-stretch/Dockerfile
similarity index 100%
rename from haxe_3.3/Dockerfile
rename to haxe_3.3-stretch/Dockerfile
diff --git a/haxe_3.3-windowsservercore/Dockerfile b/haxe_3.3-windowsservercore-1803/Dockerfile
similarity index 75%
copy from haxe_3.3-windowsservercore/Dockerfile
copy to haxe_3.3-windowsservercore-1803/Dockerfile
index 22e0c0b..cd3007c 100644
--- a/haxe_3.3-windowsservercore/Dockerfile
+++ b/haxe_3.3-windowsservercore-1803/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2016
+FROM mcr.microsoft.com/windows/servercore:1803
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
@@ -20,6 +20,26 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +93,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.3.0-rc1/h
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
@@ -84,4 +105,7 @@ RUN $newPath = ('{0}\Users\{1}' -f $env:HOMEDRIVE, $env:USERNAME); \
 	Write-Host ('Updating HOMEPATH: {0}' -f $newPath); \
 	[Environment]::SetEnvironmentVariable('HOMEPATH', $newPath, [EnvironmentVariableTarget]::Machine);
 
+# Make a request to lib.haxe.org once such that Windows fetches the cert, which can then used by haxelib.
+RUN (New-Object System.Net.WebClient).DownloadString('https://lib.haxe.org') >$null
+
 CMD ["haxe"]
diff --git a/haxe_3.3-windowsservercore/Dockerfile b/haxe_3.3-windowsservercore-ltsc2016/Dockerfile
similarity index 76%
rename from haxe_3.3-windowsservercore/Dockerfile
rename to haxe_3.3-windowsservercore-ltsc2016/Dockerfile
index 22e0c0b..fb50d20 100644
--- a/haxe_3.3-windowsservercore/Dockerfile
+++ b/haxe_3.3-windowsservercore-ltsc2016/Dockerfile
@@ -20,6 +20,26 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +93,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.3.0-rc1/h
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
@@ -84,4 +105,7 @@ RUN $newPath = ('{0}\Users\{1}' -f $env:HOMEDRIVE, $env:USERNAME); \
 	Write-Host ('Updating HOMEPATH: {0}' -f $newPath); \
 	[Environment]::SetEnvironmentVariable('HOMEPATH', $newPath, [EnvironmentVariableTarget]::Machine);
 
+# Make a request to lib.haxe.org once such that Windows fetches the cert, which can then used by haxelib.
+RUN (New-Object System.Net.WebClient).DownloadString('https://lib.haxe.org') >$null
+
 CMD ["haxe"]
diff --git a/haxe_3.4-alpine/Dockerfile b/haxe_3.4-alpine/Dockerfile
index 6bee61d..6f52e8f 100644
--- a/haxe_3.4-alpine/Dockerfile
+++ b/haxe_3.4-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.9
+FROM alpine:3.10
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
diff --git a/haxe_3.4-alpine3.6/Dockerfile b/haxe_3.4-alpine3.6/Dockerfile
deleted file mode 100644
index 67dc2e2..0000000
diff --git a/haxe_3.4-alpine/Dockerfile b/haxe_3.4-alpine3.9/Dockerfile
similarity index 100%
copy from haxe_3.4-alpine/Dockerfile
copy to haxe_3.4-alpine3.9/Dockerfile
diff --git a/haxe_latest/Dockerfile b/haxe_3.4-buster/Dockerfile
similarity index 96%
copy from haxe_latest/Dockerfile
copy to haxe_3.4-buster/Dockerfile
index f298396..67e9faf 100644
--- a/haxe_latest/Dockerfile
+++ b/haxe_3.4-buster/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:stretch-scm
+FROM buildpack-deps:buster-scm
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
@@ -14,10 +14,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		libgc1c2 \
 		zlib1g \
 		libpcre3 \
-		libmariadb2 \
+		libmariadb3 \
 		libsqlite3-0 \
-		libmbedcrypto0 \
-		libmbedtls10 \
+		libmbedcrypto3 \
+		libmbedtls12 \
 		libmbedx509-0 \
 	&& rm -rf /var/lib/apt/lists/*
 
diff --git a/haxe_latest/Dockerfile b/haxe_3.4-stretch/Dockerfile
similarity index 100%
rename from haxe_latest/Dockerfile
rename to haxe_3.4-stretch/Dockerfile
diff --git a/haxe_3.4-windowsservercore/Dockerfile b/haxe_3.4-windowsservercore-1803/Dockerfile
similarity index 75%
copy from haxe_3.4-windowsservercore/Dockerfile
copy to haxe_3.4-windowsservercore-1803/Dockerfile
index 5323e67..f425ac0 100644
--- a/haxe_3.4-windowsservercore/Dockerfile
+++ b/haxe_3.4-windowsservercore-1803/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2016
+FROM mcr.microsoft.com/windows/servercore:1803
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
@@ -20,6 +20,26 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +93,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.4.7/haxe-
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
@@ -84,4 +105,7 @@ RUN $newPath = ('{0}\Users\{1}' -f $env:HOMEDRIVE, $env:USERNAME); \
 	Write-Host ('Updating HOMEPATH: {0}' -f $newPath); \
 	[Environment]::SetEnvironmentVariable('HOMEPATH', $newPath, [EnvironmentVariableTarget]::Machine);
 
+# Make a request to lib.haxe.org once such that Windows fetches the cert, which can then used by haxelib.
+RUN (New-Object System.Net.WebClient).DownloadString('https://lib.haxe.org') >$null
+
 CMD ["haxe"]
diff --git a/haxe_3.4-windowsservercore/Dockerfile b/haxe_3.4-windowsservercore-ltsc2016/Dockerfile
similarity index 76%
rename from haxe_3.4-windowsservercore/Dockerfile
rename to haxe_3.4-windowsservercore-ltsc2016/Dockerfile
index 5323e67..735ae52 100644
--- a/haxe_3.4-windowsservercore/Dockerfile
+++ b/haxe_3.4-windowsservercore-ltsc2016/Dockerfile
@@ -20,6 +20,26 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +93,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/3.4.7/haxe-
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
@@ -84,4 +105,7 @@ RUN $newPath = ('{0}\Users\{1}' -f $env:HOMEDRIVE, $env:USERNAME); \
 	Write-Host ('Updating HOMEPATH: {0}' -f $newPath); \
 	[Environment]::SetEnvironmentVariable('HOMEPATH', $newPath, [EnvironmentVariableTarget]::Machine);
 
+# Make a request to lib.haxe.org once such that Windows fetches the cert, which can then used by haxelib.
+RUN (New-Object System.Net.WebClient).DownloadString('https://lib.haxe.org') >$null
+
 CMD ["haxe"]
diff --git a/haxe_4.0-alpine/Dockerfile b/haxe_4.0-alpine/Dockerfile
index 1a23bd0..70eb338 100644
--- a/haxe_4.0-alpine/Dockerfile
+++ b/haxe_4.0-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.9
+FROM alpine:3.10
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
diff --git a/haxe_4.0-alpine3.6/Dockerfile b/haxe_4.0-alpine3.6/Dockerfile
deleted file mode 100644
index dc6643b..0000000
diff --git a/haxe_4.0-alpine/Dockerfile b/haxe_4.0-alpine3.9/Dockerfile
similarity index 100%
copy from haxe_4.0-alpine/Dockerfile
copy to haxe_4.0-alpine3.9/Dockerfile
diff --git a/haxe_4.0/Dockerfile b/haxe_4.0-buster/Dockerfile
similarity index 88%
copy from haxe_4.0/Dockerfile
copy to haxe_4.0-buster/Dockerfile
index 7eb8c25..3331b4e 100644
--- a/haxe_4.0/Dockerfile
+++ b/haxe_4.0-buster/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:stretch-scm
+FROM buildpack-deps:buster-scm
 
 # ensure local haxe is preferred over distribution haxe
 ENV PATH /usr/local/bin:$PATH
@@ -14,10 +14,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		libgc1c2 \
 		zlib1g \
 		libpcre3 \
-		libmariadb2 \
+		libmariadb3 \
 		libsqlite3-0 \
-		libmbedcrypto0 \
-		libmbedtls10 \
+		libmbedcrypto3 \
+		libmbedtls12 \
 		libmbedx509-0 \
 	&& rm -rf /var/lib/apt/lists/*
 
@@ -68,9 +68,10 @@ RUN set -ex \
 		libxml-light-ocaml-dev \
 		\
 		opam \
-		aspcud \
+		mccs \
 		m4 \
 		unzip \
+		pkg-config \
 		\
 	' \
 	&& git clone --recursive --depth 1 --branch 4.0.0-rc.3 "https://github.com/HaxeFoundation/haxe.git" /usr/src/haxe \
@@ -78,9 +79,9 @@ RUN set -ex \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
 	\
 	\
-	&& opam init --comp system \
-	&& eval `opam config env` \
-	&& make opam_install \
+	&& opam init --disable-sandboxing \
+	&& eval `opam env` \
+	&& ( [ -f /usr/src/haxe/opam ] && opam install /usr/src/haxe --deps-only --yes || make opam_install ) \
 	\
 	&& make all tools \
 	&& mkdir -p /usr/local/bin \
diff --git a/haxe_4.0/Dockerfile b/haxe_4.0-stretch/Dockerfile
similarity index 100%
rename from haxe_4.0/Dockerfile
rename to haxe_4.0-stretch/Dockerfile
diff --git a/haxe_4.0-windowsservercore/Dockerfile b/haxe_4.0-windowsservercore-1803/Dockerfile
similarity index 75%
copy from haxe_4.0-windowsservercore/Dockerfile
copy to haxe_4.0-windowsservercore-1803/Dockerfile
index a1be233..c088b70 100644
--- a/haxe_4.0-windowsservercore/Dockerfile
+++ b/haxe_4.0-windowsservercore-1803/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2016
+FROM mcr.microsoft.com/windows/servercore:1803
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
@@ -20,6 +20,26 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +93,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/4.0.0-rc.3/
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
@@ -84,4 +105,7 @@ RUN $newPath = ('{0}\Users\{1}' -f $env:HOMEDRIVE, $env:USERNAME); \
 	Write-Host ('Updating HOMEPATH: {0}' -f $newPath); \
 	[Environment]::SetEnvironmentVariable('HOMEPATH', $newPath, [EnvironmentVariableTarget]::Machine);
 
+# Make a request to lib.haxe.org once such that Windows fetches the cert, which can then used by haxelib.
+RUN (New-Object System.Net.WebClient).DownloadString('https://lib.haxe.org') >$null
+
 CMD ["haxe"]
diff --git a/haxe_4.0-windowsservercore/Dockerfile b/haxe_4.0-windowsservercore-ltsc2016/Dockerfile
similarity index 76%
rename from haxe_4.0-windowsservercore/Dockerfile
rename to haxe_4.0-windowsservercore-ltsc2016/Dockerfile
index a1be233..1b529c3 100644
--- a/haxe_4.0-windowsservercore/Dockerfile
+++ b/haxe_4.0-windowsservercore-ltsc2016/Dockerfile
@@ -20,6 +20,26 @@ RUN $newPath = ('{0};{1};{2}' -f $env:HAXEPATH, $env:NEKOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
+# haxelib.exe needs msvcr120.dll
+RUN $url = 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe'; \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri $url -OutFile 'vcredist_x86.exe'; \
+	\
+	Write-Host 'Verifying sha256 (89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17) ...'; \
+	if ((Get-FileHash vcredist_x86.exe -Algorithm sha256).Hash -ne '89f4e593ea5541d1c53f983923124f9fd061a1c0c967339109e375c661573c17') { \
+		Write-Host 'FAILED!'; \
+		exit 1; \
+	}; \
+	\
+	Write-Host 'Installing ...'; \
+	Start-Process -FilePath "vcredist_x86.exe" -ArgumentList "/Q" -Wait; \
+	\
+	Write-Host 'Removing installer...'; \
+	Remove-Item .\vcredist_x86.exe; \
+	\
+	Write-Host 'Complete.';
+
 RUN New-Item -ItemType directory -Path $env:HAXETOOLKIT_PATH;
 
 # install neko, which is a dependency of haxelib
@@ -73,6 +93,7 @@ RUN $url = 'https://github.com/HaxeFoundation/haxe/releases/download/4.0.0-rc.3/
 	\
 	Write-Host 'Verifying install ...'; \
 	Write-Host '  haxe -version'; haxe -version; \
+	Write-Host '  haxelib version'; haxelib version; \
 	\
 	Write-Host 'Complete.';
 
@@ -84,4 +105,7 @@ RUN $newPath = ('{0}\Users\{1}' -f $env:HOMEDRIVE, $env:USERNAME); \
 	Write-Host ('Updating HOMEPATH: {0}' -f $newPath); \
 	[Environment]::SetEnvironmentVariable('HOMEPATH', $newPath, [EnvironmentVariableTarget]::Machine);
 
+# Make a request to lib.haxe.org once such that Windows fetches the cert, which can then used by haxelib.
+RUN (New-Object System.Net.WebClient).DownloadString('https://lib.haxe.org') >$null
+
 CMD ["haxe"]

@yosifkit
Copy link
Member

Build test of #6281; 0ee23f2; amd64 (haxe):

$ bashbrew build haxe:3.4.7-buster
Building bashbrew/cache:6ea749430de094018b8e5fa3f5a40e038dc079ae64f231e0c2dd3a2ecd253eb7 (haxe:3.4.7-buster)
Tagging haxe:3.4.7-buster
Tagging haxe:3.4-buster
Tagging haxe:3.4.7
Tagging haxe:3.4
Tagging haxe:latest

$ test/run.sh haxe:3.4.7-buster
testing haxe:3.4.7-buster
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.4.7-stretch
Building bashbrew/cache:0cb0a5316481f65145d83b051a71d602c5a3d5cc0ce3c156b521ed86884bf60b (haxe:3.4.7-stretch)
Tagging haxe:3.4.7-stretch
Tagging haxe:3.4-stretch

$ test/run.sh haxe:3.4.7-stretch
testing haxe:3.4.7-stretch
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.4.7-jessie
Building bashbrew/cache:1304a9941f913362058c22787bc9c36eb57742fe569677e002ae8936b6257bd8 (haxe:3.4.7-jessie)
Tagging haxe:3.4.7-jessie
Tagging haxe:3.4-jessie

$ test/run.sh haxe:3.4.7-jessie
testing haxe:3.4.7-jessie
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.4.7-windowsservercore-1803
skipping "haxe:3.4.7-windowsservercore-1803" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh haxe:3.4.7-windowsservercore-1803
testing haxe:3.4.7-windowsservercore-1803
	image has no tests...skipping


$ bashbrew build haxe:3.4.7-windowsservercore-ltsc2016
skipping "haxe:3.4.7-windowsservercore-ltsc2016" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh haxe:3.4.7-windowsservercore-ltsc2016
testing haxe:3.4.7-windowsservercore-ltsc2016
	image has no tests...skipping


$ bashbrew build haxe:3.4.7-alpine3.10
Building bashbrew/cache:736275ed404dacd5450d4b9900d84620d9d5ac001d87cb149456a94440248a6f (haxe:3.4.7-alpine3.10)
Tagging haxe:3.4.7-alpine3.10
Tagging haxe:3.4-alpine3.10
Tagging haxe:3.4.7-alpine
Tagging haxe:3.4-alpine

$ test/run.sh haxe:3.4.7-alpine3.10
testing haxe:3.4.7-alpine3.10
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.4.7-alpine3.9
Using bashbrew/cache:5aa3fac12c0bb81fd87b052be6ef105b3a06cf5c028d8e159d8cfa316a0bff1f (haxe:3.4.7-alpine3.9)
Tagging haxe:3.4.7-alpine3.9
Tagging haxe:3.4-alpine3.9

$ test/run.sh haxe:3.4.7-alpine3.9
testing haxe:3.4.7-alpine3.9
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.4.7-alpine3.8
Using bashbrew/cache:bc594ba46fe3b86557fe6e51e05b1b51395033e204a267538a17325d5cd87226 (haxe:3.4.7-alpine3.8)
Tagging haxe:3.4.7-alpine3.8
Tagging haxe:3.4-alpine3.8

$ test/run.sh haxe:3.4.7-alpine3.8
testing haxe:3.4.7-alpine3.8
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.4.7-alpine3.7
Using bashbrew/cache:f3558ec4ed0235745e49391d3c7253e540d9935e9c4ee4de8afb4022ac75c9eb (haxe:3.4.7-alpine3.7)
Tagging haxe:3.4.7-alpine3.7
Tagging haxe:3.4-alpine3.7

$ test/run.sh haxe:3.4.7-alpine3.7
testing haxe:3.4.7-alpine3.7
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.3.0-rc.1-buster
Building bashbrew/cache:3df91a651a679c8b9840c90ffbc92650dfc5d9175cd9f9d63aec879833053e6c (haxe:3.3.0-rc.1-buster)
Tagging haxe:3.3.0-rc.1-buster
Tagging haxe:3.3.0-buster
Tagging haxe:3.3-buster
Tagging haxe:3.3.0-rc.1
Tagging haxe:3.3.0
Tagging haxe:3.3

$ test/run.sh haxe:3.3.0-rc.1-buster
testing haxe:3.3.0-rc.1-buster
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.3.0-rc.1-stretch
Building bashbrew/cache:ccfb2e853a384623a10665617b3d034c9bd5c9e5e43db694023b433447a09b5a (haxe:3.3.0-rc.1-stretch)
Tagging haxe:3.3.0-rc.1-stretch
Tagging haxe:3.3.0-stretch
Tagging haxe:3.3-stretch

$ test/run.sh haxe:3.3.0-rc.1-stretch
testing haxe:3.3.0-rc.1-stretch
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.3.0-rc.1-jessie
Building bashbrew/cache:24ada2fbb388956296713467d2606ec35c2893fdc51d6004b7c5657a5edeca89 (haxe:3.3.0-rc.1-jessie)
Tagging haxe:3.3.0-rc.1-jessie
Tagging haxe:3.3.0-jessie
Tagging haxe:3.3-jessie

$ test/run.sh haxe:3.3.0-rc.1-jessie
testing haxe:3.3.0-rc.1-jessie
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.3.0-rc.1-windowsservercore-1803
skipping "haxe:3.3.0-rc.1-windowsservercore-1803" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh haxe:3.3.0-rc.1-windowsservercore-1803
testing haxe:3.3.0-rc.1-windowsservercore-1803
	image has no tests...skipping


$ bashbrew build haxe:3.3.0-rc.1-windowsservercore-ltsc2016
skipping "haxe:3.3.0-rc.1-windowsservercore-ltsc2016" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh haxe:3.3.0-rc.1-windowsservercore-ltsc2016
testing haxe:3.3.0-rc.1-windowsservercore-ltsc2016
	image has no tests...skipping


$ bashbrew build haxe:3.3.0-rc.1-alpine3.10
Building bashbrew/cache:0be3c3c0ea264857779f2ec3b831c288bdace92efa75a222d74563ee65d5f333 (haxe:3.3.0-rc.1-alpine3.10)
Tagging haxe:3.3.0-rc.1-alpine3.10
Tagging haxe:3.3.0-rc.1-alpine
Tagging haxe:3.3.0-alpine3.10
Tagging haxe:3.3-alpine3.10
Tagging haxe:3.3.0-alpine
Tagging haxe:3.3-alpine

$ test/run.sh haxe:3.3.0-rc.1-alpine3.10
testing haxe:3.3.0-rc.1-alpine3.10
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.3.0-rc.1-alpine3.9
Using bashbrew/cache:cd7c7a1cc270a97a2891041ec1f4fc354398855e6bf25c4ab16b98fd57ef8d0f (haxe:3.3.0-rc.1-alpine3.9)
Tagging haxe:3.3.0-rc.1-alpine3.9
Tagging haxe:3.3.0-alpine3.9
Tagging haxe:3.3-alpine3.9

$ test/run.sh haxe:3.3.0-rc.1-alpine3.9
testing haxe:3.3.0-rc.1-alpine3.9
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.3.0-rc.1-alpine3.8
Using bashbrew/cache:2c573b4cd52cc449892b559f3596dc91b96f58d9841e884c1b6914bf4bbb10ba (haxe:3.3.0-rc.1-alpine3.8)
Tagging haxe:3.3.0-rc.1-alpine3.8
Tagging haxe:3.3.0-alpine3.8
Tagging haxe:3.3-alpine3.8

$ test/run.sh haxe:3.3.0-rc.1-alpine3.8
testing haxe:3.3.0-rc.1-alpine3.8
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.3.0-rc.1-alpine3.7
Using bashbrew/cache:b78cb9e0f0b93e7b85ab069a59361564cebe394eae95e849a0145528c8b43ea5 (haxe:3.3.0-rc.1-alpine3.7)
Tagging haxe:3.3.0-rc.1-alpine3.7
Tagging haxe:3.3.0-alpine3.7
Tagging haxe:3.3-alpine3.7

$ test/run.sh haxe:3.3.0-rc.1-alpine3.7
testing haxe:3.3.0-rc.1-alpine3.7
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.2.1-buster
Building bashbrew/cache:34363f0bc6082db70980b2988c514d4ea3511cbfc826c7da60f496f12c5549ab (haxe:3.2.1-buster)
Tagging haxe:3.2.1-buster
Tagging haxe:3.2-buster
Tagging haxe:3.2.1
Tagging haxe:3.2

$ test/run.sh haxe:3.2.1-buster
testing haxe:3.2.1-buster
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.2.1-stretch
Building bashbrew/cache:f133bea75f1457900f8dd872b934a2a8b6bcf212106ea466b80bec3f07f302ef (haxe:3.2.1-stretch)
Tagging haxe:3.2.1-stretch
Tagging haxe:3.2-stretch

$ test/run.sh haxe:3.2.1-stretch
testing haxe:3.2.1-stretch
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.2.1-jessie
Building bashbrew/cache:aaed713b3105e4a675e0bf15fee3a316887ea904bace677ba08be71a73ab46ec (haxe:3.2.1-jessie)
Tagging haxe:3.2.1-jessie
Tagging haxe:3.2-jessie

$ test/run.sh haxe:3.2.1-jessie
testing haxe:3.2.1-jessie
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.2.1-windowsservercore-1803
skipping "haxe:3.2.1-windowsservercore-1803" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh haxe:3.2.1-windowsservercore-1803
testing haxe:3.2.1-windowsservercore-1803
	image has no tests...skipping


$ bashbrew build haxe:3.2.1-windowsservercore-ltsc2016
skipping "haxe:3.2.1-windowsservercore-ltsc2016" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh haxe:3.2.1-windowsservercore-ltsc2016
testing haxe:3.2.1-windowsservercore-ltsc2016
	image has no tests...skipping


$ bashbrew build haxe:3.2.1-alpine3.10
Building bashbrew/cache:012670fcec9c261d17870d33e034f03b9ab28ef6dea4a4756d9bf47d08084baa (haxe:3.2.1-alpine3.10)
Tagging haxe:3.2.1-alpine3.10
Tagging haxe:3.2-alpine3.10
Tagging haxe:3.2.1-alpine
Tagging haxe:3.2-alpine

$ test/run.sh haxe:3.2.1-alpine3.10
testing haxe:3.2.1-alpine3.10
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.2.1-alpine3.9
Using bashbrew/cache:0dae01fac7fb2a62604d6caccfc4437667f4123ec32342a71a8de585b592d7d1 (haxe:3.2.1-alpine3.9)
Tagging haxe:3.2.1-alpine3.9
Tagging haxe:3.2-alpine3.9

$ test/run.sh haxe:3.2.1-alpine3.9
testing haxe:3.2.1-alpine3.9
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.2.1-alpine3.8
Using bashbrew/cache:485a40ec13f352752c3fe54060e79271e73b3c2e4b580b93ebe96ba9078092cb (haxe:3.2.1-alpine3.8)
Tagging haxe:3.2.1-alpine3.8
Tagging haxe:3.2-alpine3.8

$ test/run.sh haxe:3.2.1-alpine3.8
testing haxe:3.2.1-alpine3.8
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.2.1-alpine3.7
Using bashbrew/cache:312c652497d2aa0f798fd7d6f76d05ee4777d063e6671c62a8f57bf914d214c1 (haxe:3.2.1-alpine3.7)
Tagging haxe:3.2.1-alpine3.7
Tagging haxe:3.2-alpine3.7

$ test/run.sh haxe:3.2.1-alpine3.7
testing haxe:3.2.1-alpine3.7
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.1.3-stretch
Building bashbrew/cache:8f16d039344856476f3362d2a0b812be7c8ee07d1daa3743620a999f23276db7 (haxe:3.1.3-stretch)
Tagging haxe:3.1.3-stretch
Tagging haxe:3.1-stretch

$ test/run.sh haxe:3.1.3-stretch
testing haxe:3.1.3-stretch
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.1.3-jessie
Building bashbrew/cache:ff8087b16cc5d753b0005bdf77ce07f8de54a7b7305ad6c49c892d40141d5aba (haxe:3.1.3-jessie)
Tagging haxe:3.1.3-jessie
Tagging haxe:3.1-jessie

$ test/run.sh haxe:3.1.3-jessie
testing haxe:3.1.3-jessie
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:3.1.3-windowsservercore-1803
skipping "haxe:3.1.3-windowsservercore-1803" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh haxe:3.1.3-windowsservercore-1803
testing haxe:3.1.3-windowsservercore-1803
	image has no tests...skipping


$ bashbrew build haxe:3.1.3-windowsservercore-ltsc2016
skipping "haxe:3.1.3-windowsservercore-ltsc2016" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh haxe:3.1.3-windowsservercore-ltsc2016
testing haxe:3.1.3-windowsservercore-ltsc2016
	image has no tests...skipping


$ bashbrew build haxe:4.0.0-rc.3-buster
Building bashbrew/cache:3d3398ee98e6b650baaa6eaf4b19535ac2acc89dc58ade04d019fb481e4856fc (haxe:4.0.0-rc.3-buster)
Tagging haxe:4.0.0-rc.3-buster
Tagging haxe:4.0.0-buster
Tagging haxe:4.0-buster
Tagging haxe:4.0.0-rc.3
Tagging haxe:4.0.0
Tagging haxe:4.0

$ test/run.sh haxe:4.0.0-rc.3-buster
testing haxe:4.0.0-rc.3-buster
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:4.0.0-rc.3-stretch
Building bashbrew/cache:f4bbcb0ce0bbc9f6acedbe9d820c84127e1cbd2d24b4b01b48858f3de716543c (haxe:4.0.0-rc.3-stretch)
Tagging haxe:4.0.0-rc.3-stretch
Tagging haxe:4.0.0-stretch
Tagging haxe:4.0-stretch

$ test/run.sh haxe:4.0.0-rc.3-stretch
testing haxe:4.0.0-rc.3-stretch
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:4.0.0-rc.3-jessie
Building bashbrew/cache:5adf9bddb054857598db4f093cf1651abc718cd40c66c4b2e7b8313edb0d8bd8 (haxe:4.0.0-rc.3-jessie)
Tagging haxe:4.0.0-rc.3-jessie
Tagging haxe:4.0.0-jessie
Tagging haxe:4.0-jessie

$ test/run.sh haxe:4.0.0-rc.3-jessie
testing haxe:4.0.0-rc.3-jessie
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:4.0.0-rc.3-windowsservercore-1803
skipping "haxe:4.0.0-rc.3-windowsservercore-1803" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh haxe:4.0.0-rc.3-windowsservercore-1803
testing haxe:4.0.0-rc.3-windowsservercore-1803
	image has no tests...skipping


$ bashbrew build haxe:4.0.0-rc.3-windowsservercore-ltsc2016
skipping "haxe:4.0.0-rc.3-windowsservercore-ltsc2016" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh haxe:4.0.0-rc.3-windowsservercore-ltsc2016
testing haxe:4.0.0-rc.3-windowsservercore-ltsc2016
	image has no tests...skipping


$ bashbrew build haxe:4.0.0-rc.3-alpine3.10
Building bashbrew/cache:711b43dc6e631827f15cd4e74da5a23ad2af671fb97938c8b1be19a1e1f523b8 (haxe:4.0.0-rc.3-alpine3.10)
Tagging haxe:4.0.0-rc.3-alpine3.10
Tagging haxe:4.0.0-rc.3-alpine
Tagging haxe:4.0.0-alpine3.10
Tagging haxe:4.0-alpine3.10
Tagging haxe:4.0.0-alpine
Tagging haxe:4.0-alpine

$ test/run.sh haxe:4.0.0-rc.3-alpine3.10
testing haxe:4.0.0-rc.3-alpine3.10
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:4.0.0-rc.3-alpine3.9
Using bashbrew/cache:4561ca83d0f239f10437d53eb3b264e4e91dd4224d45d9304b8b143905629f22 (haxe:4.0.0-rc.3-alpine3.9)
Tagging haxe:4.0.0-rc.3-alpine3.9
Tagging haxe:4.0.0-alpine3.9
Tagging haxe:4.0-alpine3.9

$ test/run.sh haxe:4.0.0-rc.3-alpine3.9
testing haxe:4.0.0-rc.3-alpine3.9
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:4.0.0-rc.3-alpine3.8
Using bashbrew/cache:3f08960dd1c7ca2079733e7be1bf743cdb9773ac63a9b970af9cdd157bf25383 (haxe:4.0.0-rc.3-alpine3.8)
Tagging haxe:4.0.0-rc.3-alpine3.8
Tagging haxe:4.0.0-alpine3.8
Tagging haxe:4.0-alpine3.8

$ test/run.sh haxe:4.0.0-rc.3-alpine3.8
testing haxe:4.0.0-rc.3-alpine3.8
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed


$ bashbrew build haxe:4.0.0-rc.3-alpine3.7
Using bashbrew/cache:102d9cee745a130ae2ea0a7c101872a7fcbd807707d655556c0822b6014fda62 (haxe:4.0.0-rc.3-alpine3.7)
Tagging haxe:4.0.0-rc.3-alpine3.7
Tagging haxe:4.0.0-alpine3.7
Tagging haxe:4.0-alpine3.7

$ test/run.sh haxe:4.0.0-rc.3-alpine3.7
testing haxe:4.0.0-rc.3-alpine3.7
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'haxe-hello-world' [5/6]...passed
	'haxe-haxelib-install' [6/6]...passed

@yosifkit yosifkit merged commit f9f270b into docker-library:master Jul 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants