From 378aff19d13ac4ddab43b82e3f2bbf510eab35b6 Mon Sep 17 00:00:00 2001 From: Andrey Mishechkin Date: Wed, 5 Feb 2020 16:32:34 +0400 Subject: [PATCH 1/3] dotnetcore.sh and powershellcore.sh has been moved up --- images/linux/ubuntu1604.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 30f25d9a5..f82606d1f 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -116,6 +116,8 @@ { "type": "shell", "scripts": [ + "{{template_dir}}/scripts/installers/1604/dotnetcore-sdk.sh", + "{{template_dir}}/scripts/installers/1604/powershellcore.sh", "{{template_dir}}/scripts/installers/7-zip.sh", "{{template_dir}}/scripts/installers/ansible.sh", "{{template_dir}}/scripts/installers/azcopy.sh", @@ -129,7 +131,6 @@ "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", "{{template_dir}}/scripts/installers/docker.sh", - "{{template_dir}}/scripts/installers/1604/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/gcc.sh", @@ -154,7 +155,6 @@ "{{template_dir}}/scripts/installers/1604/php.sh", "{{template_dir}}/scripts/installers/pollinate.sh", "{{template_dir}}/scripts/installers/postgresql.sh", - "{{template_dir}}/scripts/installers/1604/powershellcore.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", "{{template_dir}}/scripts/installers/sbt.sh", From 98e26dd773e7fb37e6ef53f13b97eaddd928e612 Mon Sep 17 00:00:00 2001 From: Andrey Mishechkin Date: Thu, 6 Feb 2020 14:16:18 +0400 Subject: [PATCH 2/3] creation of dotnetdev.list repository has been removed --- images/linux/scripts/installers/1604/dotnetcore-sdk.sh | 10 +++++----- images/linux/ubuntu1604.json | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh index e772d924c..9a933376a 100644 --- a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh @@ -34,11 +34,11 @@ for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do echo "Determing if .NET Core ($latest_package) is installed" if ! IsInstalled $latest_package; then echo "Could not find .NET Core ($latest_package), installing..." - curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg - mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg - sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' - apt-get install apt-transport-https - apt-get update + #curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg + #mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg + #sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' + #apt-get install apt-transport-https + #apt-get update apt-get install $latest_package -y else echo ".NET Core ($latest_package) is already installed" diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index f82606d1f..30f25d9a5 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -116,8 +116,6 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/1604/dotnetcore-sdk.sh", - "{{template_dir}}/scripts/installers/1604/powershellcore.sh", "{{template_dir}}/scripts/installers/7-zip.sh", "{{template_dir}}/scripts/installers/ansible.sh", "{{template_dir}}/scripts/installers/azcopy.sh", @@ -131,6 +129,7 @@ "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", "{{template_dir}}/scripts/installers/docker.sh", + "{{template_dir}}/scripts/installers/1604/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/gcc.sh", @@ -155,6 +154,7 @@ "{{template_dir}}/scripts/installers/1604/php.sh", "{{template_dir}}/scripts/installers/pollinate.sh", "{{template_dir}}/scripts/installers/postgresql.sh", + "{{template_dir}}/scripts/installers/1604/powershellcore.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", "{{template_dir}}/scripts/installers/sbt.sh", From 2c0ff371474c4e6143fc00851d986c1333debe99 Mon Sep 17 00:00:00 2001 From: Andrey Mishechkin Date: Thu, 6 Feb 2020 23:14:36 +0400 Subject: [PATCH 3/3] Commented creation of dotnetdev.list repository has been removed --- images/linux/scripts/installers/1604/dotnetcore-sdk.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh index 9a933376a..9baa83e9b 100644 --- a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh @@ -34,11 +34,6 @@ for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do echo "Determing if .NET Core ($latest_package) is installed" if ! IsInstalled $latest_package; then echo "Could not find .NET Core ($latest_package), installing..." - #curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg - #mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg - #sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' - #apt-get install apt-transport-https - #apt-get update apt-get install $latest_package -y else echo ".NET Core ($latest_package) is already installed"