From d9b5c61fce7120738438cce981a91f4128339dd1 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Wed, 19 Jun 2019 10:35:33 -0400 Subject: [PATCH 01/12] Docker Tests: Improve performance and make images smaller --- docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile b/docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile index ef2538d1aa3..4964c9613d6 100644 --- a/docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile +++ b/docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile @@ -13,14 +13,16 @@ RUN apt-get update \ ca-certificates \ apt-transport-https \ locales \ - git + git \ + && apt-get clean # Install dotnet-runtime ADD https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb . RUN dpkg -i packages-microsoft-prod.deb RUN apt-get update \ && apt-get install -y --no-install-recommends \ - dotnet-runtime-2.1 + dotnet-runtime-2.1 \ + && apt-get clean # Setup the locale ENV LANG en_US.UTF-8 From 8494acb8d06469cf02fd1238ec9cf52cf866df6f Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Wed, 19 Jun 2019 10:36:48 -0400 Subject: [PATCH 02/12] Update Dockerfile --- docker/tests/Templates/ubuntu16.04/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/tests/Templates/ubuntu16.04/Dockerfile b/docker/tests/Templates/ubuntu16.04/Dockerfile index f84a8fe1eec..c7acec6bd75 100644 --- a/docker/tests/Templates/ubuntu16.04/Dockerfile +++ b/docker/tests/Templates/ubuntu16.04/Dockerfile @@ -14,7 +14,8 @@ RUN apt-get update \ curl \ apt-transport-https \ locales \ - git + git \ + && apt-get clean # Setup the locale ENV LANG en_US.UTF-8 From d13d9038075d31bac720707014559d46f343ae6a Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Wed, 19 Jun 2019 10:37:04 -0400 Subject: [PATCH 03/12] Update Dockerfile --- docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile b/docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile index a8d8ccca43f..acec24a0f6e 100644 --- a/docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile +++ b/docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile @@ -13,7 +13,8 @@ RUN apt-get update \ ca-certificates \ apt-transport-https \ locales \ - git + git \ + && apt-get clean # Setup the locale ENV LANG en_US.UTF-8 From fa6c34ffc3e99eadcaec7c54913bc7e2117c592e Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Wed, 19 Jun 2019 10:37:27 -0400 Subject: [PATCH 04/12] Update Dockerfile --- docker/tests/Templates/ubuntu18.04/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/tests/Templates/ubuntu18.04/Dockerfile b/docker/tests/Templates/ubuntu18.04/Dockerfile index da7a0b0a3c6..fdb189de8ef 100644 --- a/docker/tests/Templates/ubuntu18.04/Dockerfile +++ b/docker/tests/Templates/ubuntu18.04/Dockerfile @@ -14,7 +14,8 @@ RUN apt-get update \ curl \ apt-transport-https \ locales \ - git + git \ + && apt-get clean # Setup the locale ENV LANG en_US.UTF-8 From 1c1bb4826d4441a5d22cbb170cb8f10ab3e30a06 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Wed, 19 Jun 2019 10:37:50 -0400 Subject: [PATCH 05/12] Update Dockerfile --- docker/tests/Templates/debian.9/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/tests/Templates/debian.9/Dockerfile b/docker/tests/Templates/debian.9/Dockerfile index a1775442b66..71cf613ff13 100644 --- a/docker/tests/Templates/debian.9/Dockerfile +++ b/docker/tests/Templates/debian.9/Dockerfile @@ -14,7 +14,8 @@ RUN apt-get update \ curl \ apt-transport-https \ locales \ - git + git \ + && apt-get clean # Setup the locale ENV LANG en_US.UTF-8 From bd826592cf6a175f2d617a635d0ba50d50359592 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Wed, 19 Jun 2019 10:38:05 -0400 Subject: [PATCH 06/12] Update Dockerfile --- docker/tests/Templates/fxdependent-debian.9/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/tests/Templates/fxdependent-debian.9/Dockerfile b/docker/tests/Templates/fxdependent-debian.9/Dockerfile index 3c4b6815d55..2d7beff913b 100644 --- a/docker/tests/Templates/fxdependent-debian.9/Dockerfile +++ b/docker/tests/Templates/fxdependent-debian.9/Dockerfile @@ -13,7 +13,8 @@ RUN apt-get update \ ca-certificates \ apt-transport-https \ locales \ - git + git \ + && apt-get clean # Setup the locale ENV LANG en_US.UTF-8 From 417fd99f277c566d4b6f13cb9c3573b68c240c86 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Wed, 19 Jun 2019 10:38:30 -0400 Subject: [PATCH 07/12] Update Dockerfile --- docker/tests/Templates/fxdependent-dotnetsdk-latest/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/tests/Templates/fxdependent-dotnetsdk-latest/Dockerfile b/docker/tests/Templates/fxdependent-dotnetsdk-latest/Dockerfile index a9f245c30f0..bd61efbf6cb 100644 --- a/docker/tests/Templates/fxdependent-dotnetsdk-latest/Dockerfile +++ b/docker/tests/Templates/fxdependent-dotnetsdk-latest/Dockerfile @@ -13,7 +13,8 @@ RUN apt-get update \ ca-certificates \ apt-transport-https \ locales \ - git + git \ + && apt-get clean # Setup the locale ENV LANG en_US.UTF-8 From 713afd64f74cc3e173fb4f0a83b517a8a0acd04d Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Wed, 19 Jun 2019 10:41:20 -0400 Subject: [PATCH 08/12] Fix --- docker/tests/Templates/ubuntu16.04/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/tests/Templates/ubuntu16.04/Dockerfile b/docker/tests/Templates/ubuntu16.04/Dockerfile index c7acec6bd75..7439eda5a7d 100644 --- a/docker/tests/Templates/ubuntu16.04/Dockerfile +++ b/docker/tests/Templates/ubuntu16.04/Dockerfile @@ -24,6 +24,6 @@ RUN locale-gen $LANG && update-locale RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME RUN dpkg -i $PACKAGENAME || : -RUN apt-get install -y -f +RUN apt-get install -y -f --no-install-recommends RUN $TESTDOWNLOADCOMMAND RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount" From 2e053a15c57190c7a6cffa3a3be92c19f86afe4d Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Wed, 19 Jun 2019 10:41:41 -0400 Subject: [PATCH 09/12] Update Dockerfile --- docker/tests/Templates/ubuntu18.04/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/tests/Templates/ubuntu18.04/Dockerfile b/docker/tests/Templates/ubuntu18.04/Dockerfile index fdb189de8ef..6c7a960130d 100644 --- a/docker/tests/Templates/ubuntu18.04/Dockerfile +++ b/docker/tests/Templates/ubuntu18.04/Dockerfile @@ -24,6 +24,6 @@ RUN locale-gen $LANG && update-locale RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME RUN dpkg -i $PACKAGENAME || : -RUN apt-get install -y -f +RUN apt-get install -y -f --no-install-recommends RUN $TESTDOWNLOADCOMMAND RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount" From e4baff50bf51295e5c9749ccf0a11f816ae30221 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Wed, 19 Jun 2019 10:42:03 -0400 Subject: [PATCH 10/12] Update Dockerfile --- docker/tests/Templates/debian.9/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/tests/Templates/debian.9/Dockerfile b/docker/tests/Templates/debian.9/Dockerfile index 71cf613ff13..f2de0f8d61f 100644 --- a/docker/tests/Templates/debian.9/Dockerfile +++ b/docker/tests/Templates/debian.9/Dockerfile @@ -24,6 +24,6 @@ RUN locale-gen $LANG && update-locale RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME RUN dpkg -i $PACKAGENAME || : -RUN apt-get install -y -f +RUN apt-get install -y -f --no-install-recommends RUN $TESTDOWNLOADCOMMAND RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount" From 2ef2b7fd05970a0f74a7ae451a0d6a34723fbe5f Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Wed, 19 Jun 2019 10:44:02 -0400 Subject: [PATCH 11/12] Update Dockerfile --- .../Images/microsoft_powershell_ubuntu16.04/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/releaseBuild/Images/microsoft_powershell_ubuntu16.04/Dockerfile b/tools/releaseBuild/Images/microsoft_powershell_ubuntu16.04/Dockerfile index 251ff4153ca..401af92128a 100644 --- a/tools/releaseBuild/Images/microsoft_powershell_ubuntu16.04/Dockerfile +++ b/tools/releaseBuild/Images/microsoft_powershell_ubuntu16.04/Dockerfile @@ -26,6 +26,7 @@ RUN apt-get update \ apt-transport-https \ locales \ wget \ + && apt-get clean \ && rm -rf /var/lib/apt/lists/* COPY PowerShellPackage.ps1 / From eaeb96fd9f76980ef842f2786e96d48d0ffbae77 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Wed, 19 Jun 2019 10:44:42 -0400 Subject: [PATCH 12/12] Update Dockerfile --- .../Images/microsoft_powershell_ubuntu18.04/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/releaseBuild/Images/microsoft_powershell_ubuntu18.04/Dockerfile b/tools/releaseBuild/Images/microsoft_powershell_ubuntu18.04/Dockerfile index 11dd7480d40..f8049e9de1c 100644 --- a/tools/releaseBuild/Images/microsoft_powershell_ubuntu18.04/Dockerfile +++ b/tools/releaseBuild/Images/microsoft_powershell_ubuntu18.04/Dockerfile @@ -26,6 +26,7 @@ RUN apt-get update \ apt-transport-https \ locales \ wget \ + && apt-get clean \ && rm -rf /var/lib/apt/lists/* COPY PowerShellPackage.ps1 /