Update Windows containers to EnterpriseDB

Author: stellirin

Dockerfile-windows.template

@@ -1,76 +1,62 @@
 ####
-#### Pretty Good Command Line Interface (PGCLI)
+#### Download and prepare PostgreSQL for Windows
 ####
-FROM microsoft/windowsservercore:1803 as prepare
-
-# Set the variables for PGCLI
-ENV PGC_VER %%PGC_VERSION%%
-ENV PGC_REPO %%PGC_REPOSITORY%%
+FROM mcr.microsoft.com/windows/servercore:1809 as prepare
 
 ##### Use PowerShell for the installation
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-### Required for PGCLI
-ENV PYTHONIOENCODING UTF-8
-
-### Download PGCLI
-RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
-    Invoke-WebRequest $('{0}/bigsql-pgc-{1}.zip' -f $env:PGC_REPO,$env:PGC_VER) -OutFile 'C:\\BigSQL.zip' ; \
-    Expand-Archive 'C:\\BigSQL.zip' -DestinationPath 'C:\\' ; \
-    Remove-Item -Path 'C:\\BigSQL.zip'
-
-### Update PGCLI
-RUN Invoke-Expression -Command $('C:\\bigsql\\pgc set GLOBAL REPO {0}' -f$env:PGC_REPO) ; \
-    Invoke-Expression -Command   'C:\\bigsql\\pgc update --silent' ; \
-    Remove-Item -Path 'C:\\bigsql\\conf\\pgc.pid'
-
-####
-#### Download PostgreSQL
-####
-FROM prepare as download
-
-### Set the PostgreSQL version we will install
-### This is set here to allow us to reuse the abover layers
-ENV PGC_DB %%PGC_DB_VERSION%%
-
-### Download PostgreSQL
-RUN Invoke-Expression -Command $('C:\\bigsql\\pgc install --silent {0}' -f $env:PGC_DB) ; \
-    Invoke-Expression -Command   'C:\\bigsql\\pgc clean' ; \
-    Remove-Item -Path 'C:\\bigsql\\conf\\pgc.pid'
+### Download EnterpriseDB and remove cruft
+RUN $URL1 = '%%EDB_REPOSITORY%%/postgresql-%%EDB_VERSION%%-windows-x64-binaries.zip' ; \
+    Invoke-WebRequest -Uri $URL1 -OutFile 'C:\\EnterpriseDB.zip' ; \
+    Expand-Archive 'C:\\EnterpriseDB.zip' -DestinationPath 'C:\\' ; \
+    Remove-Item -Path 'C:\\EnterpriseDB.zip' ; \
+    Remove-Item -Recurse -Force –Path 'C:\\pgsql\\doc' ; \
+    Remove-Item -Recurse -Force –Path 'C:\\pgsql\\include' ; \
+    Remove-Item -Recurse -Force –Path 'C:\\pgsql\\pgAdmin*' ; \
+    Remove-Item -Recurse -Force –Path 'C:\\pgsql\\StackBuilder'
 
 ### Make the sample config easier to munge (and "correct by default")
-RUN $SAMPLE_FILE = $('C:\\bigsql\\{0}\\share\\postgresql\\postgresql.conf.sample' -f $env:PGC_DB) ; \
+RUN $SAMPLE_FILE = 'C:\\pgsql\\share\\postgresql.conf.sample' ; \
     $SAMPLE_CONF = Get-Content $SAMPLE_FILE ; \
     $SAMPLE_CONF = $SAMPLE_CONF -Replace '#listen_addresses = ''localhost''','listen_addresses = ''*''' ; \
     $SAMPLE_CONF | Set-Content $SAMPLE_FILE
 
+# Install Visual C++ Redistributable Package
+RUN $URL2 = '%%EDB_VCREDIST%%' ; \
+    Invoke-WebRequest -Uri $URL2 -OutFile 'C:\\vcredist.exe' ; \
+    Start-Process 'C:\\vcredist.exe' -Wait \
+        -ArgumentList @( \
+            '/install', \
+            '/passive', \
+            '/norestart' \
+        )
+
+# Copy relevant DLLs to PostgreSQL
+RUN if (Test-Path 'C:\\windows\\system32\\msvcp120.dll') { \
+        Write-Host('Visual C++ 2013 Redistributable Package') ; \
+        Copy-Item 'C:\\windows\\system32\\msvcp120.dll' -Destination 'C:\\pgsql\\bin\\msvcp120.dll' ; \
+        Copy-Item 'C:\\windows\\system32\\msvcr120.dll' -Destination 'C:\\pgsql\\bin\\msvcr120.dll' ; \
+    } else { \
+        Write-Host('Visual C++ 2017 Redistributable Package') ; \
+        Copy-Item 'C:\\windows\\system32\\vcruntime140.dll' -Destination 'C:\\pgsql\\bin\\vcruntime140.dll' ; \
+    }
+
 ####
 #### PostgreSQL on Windows Nano Server
 ####
-FROM microsoft/nanoserver:1803
+FROM mcr.microsoft.com/windows/nanoserver:1809
 
 RUN mkdir "C:\\docker-entrypoint-initdb.d"
 
-#### Copy over the PGCLI
-COPY --from=prepare "C:\\bigsql" "C:\\bigsql"
-
-### Set the PostgreSQL version we will install
-### This is set here to allow us to reuse the abover layers
-ENV PGC_DB %%PGC_DB_VERSION%%
-
-### Required for PGCLI
-ENV PYTHONIOENCODING="UTF-8" \
-    PYTHONPATH="C:\\bigsql\\${PGC_DB}\\python\\site-packages" \
-    GDAL_DATA="C:\\bigsql\\${PGC_DB}\\share\\gdal"
-
-#### Copy over PostgeSQL
-COPY --from=download "C:\\bigsql\\${PGC_DB}" "C:\\bigsql\\${PGC_DB}"
+#### Copy over PostgreSQL
+COPY --from=prepare "C:\\pgsql" "C:\\pgsql"
 
 #### In order to set system PATH, ContainerAdministrator must be used
 USER ContainerAdministrator
-RUN setx /M PATH "C:\\bigsql\\%PGC_DB%\\bin;%PATH%"
+RUN setx /M PATH "C:\\pgsql\\bin;%PATH%"
 USER ContainerUser
-ENV PGDATA "C:\\bigsql\\data\\${PGC_DB}"
+ENV PGDATA "C:\\pgsql\\data"
 RUN mkdir "%PGDATA%"
 
 COPY docker-entrypoint.cmd "C:\\"

update.sh

@@ -104,32 +104,41 @@ for version in "${versions[@]}"; do
 			continue
 		fi
 
-		pgcVersion='3.3.7'
-		pgcRepository='https://s3.amazonaws.com/pgcentral'
+		edbRepository='https://get.enterprisedb.com/postgresql'
 
 		cp docker-entrypoint.cmd "$version/$variant/docker-entrypoint.cmd"
 		cp Dockerfile-windows.template "$version/$variant/Dockerfile"
 
 		case "$version" in
 			9.4)
-				pgcDbVersion='pg94'
+				edbVersion='9.4.22-1'
+				# Visual C++ 2013 Redistributable Package
+				edbVCRedist='https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe'
 				;;
 			9.5)
-				pgcDbVersion='pg95'
+				edbVersion='9.5.17-1'
+				# Visual C++ 2013 Redistributable Package
+				edbVCRedist='https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe'
 				;;
 			9.6)
-				pgcDbVersion='pg96'
+				edbVersion='9.6.13-1'
+				# Visual C++ 2013 Redistributable Package
+				edbVCRedist='https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe'
 				;;
 			10)
-				pgcDbVersion='pg10'
+				edbVersion='10.8-1'
+				# Visual C++ 2013 Redistributable Package
+				edbVCRedist='https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe'
 				;;
 			11)
-				pgcDbVersion='pg11'
+				edbVersion='11.3-1'
+				# Visual C++ 2017 Redistributable Package
+				edbVCRedist='https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe'
 				;;
 		esac
-		sed -e 's|%%PGC_VERSION%%|'"$pgcVersion"'|g' \
-			-e 's|%%PGC_REPOSITORY%%|'"$pgcRepository"'|g' \
-			-e 's|%%PGC_DB_VERSION%%|'"$pgcDbVersion"'|g' \
+		sed -e 's|%%EDB_VERSION%%|'"$edbVersion"'|g' \
+			-e 's|%%EDB_REPOSITORY%%|'"$edbRepository"'|g' \
+			-e 's|%%EDB_VCREDIST%%|'"$edbVCRedist"'|g' \
 			"Dockerfile-$variant.template" > "$version/$variant/Dockerfile"
 	done