diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 65ce6647f..11b2dcacc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ Here are a few things you can do that will increase the likelihood of your pull - Follow the style guide for [Powershell](https://github.com/PoshCode/PowerShellPracticeAndStyle) when writing Windows scripts. There is currently no set style for the Shell scripts that run Linux installs :soon:. - Include complete details of why this is needed in the PR description. - Keep your change as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests. -- Write [good commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). +- Write [good commit messages](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). - For new tools: - Make sure that the tool satisfies the [Software Guidelines](README.md#software-guidelines). - Create an issue and get approval from us to add this tool to the image before creating the pull request. diff --git a/README.md b/README.md index fd26f3465..0a7056d0e 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ We use third-party package managers to install software during the image generat | Operating system | Package manager | Third-party repos and packages | | :--- | :---: | ---: | -| Ubuntu | [APT](https://wiki.debian.org/Apt) | [containers](https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) (Ubuntu 20 only)
[docker](https://download.docker.com/linux/ubuntu) (Ubuntu20 0nly)
[Eclipse-Temurin (Adoptium)](https://packages.adoptium.net/artifactory/deb/)
[Erlang](https://packages.erlang-solutions.com/ubuntu)
[Firefox](http://ppa.launchpad.net/mozillateam/ppa/ubuntu)
[git-lfs](https://packagecloud.io/install/repositories/github/git-lfs)
[git](https://launchpad.net/~git-core/+archive/ubuntu/ppa)
[Google Cloud CLI](https://packages.cloud.google.com/apt)
[Heroku](https://cli-assets.heroku.com/channels/stable/apt)
[HHvm](https://dl.hhvm.com/ubuntu)
[MongoDB](https://repo.mongodb.org/apt/ubuntu)
[Mono](https://download.mono-project.com/repo/ubuntu)
[MS Edge](https://packages.microsoft.com/repos/edge)
[PostgreSQL](https://apt.postgresql.org/pub/repos/apt/)
[R](https://cloud.r-project.org/bin/linux/ubuntu) | +| Ubuntu | [APT](https://wiki.debian.org/Apt) | [containers](https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) (Ubuntu 20 only)
[docker](https://download.docker.com/linux/ubuntu) (Ubuntu20 0nly)
[Eclipse-Temurin (Adoptium)](https://packages.adoptium.net/artifactory/deb/)
[Erlang](https://packages.erlang-solutions.com/ubuntu)
[Firefox](https://ppa.launchpad.net/mozillateam/ppa/ubuntu)
[git-lfs](https://packagecloud.io/install/repositories/github/git-lfs)
[git](https://launchpad.net/~git-core/+archive/ubuntu/ppa)
[Google Cloud CLI](https://packages.cloud.google.com/apt)
[Heroku](https://cli-assets.heroku.com/channels/stable/apt)
[HHvm](https://dl.hhvm.com/ubuntu)
[MongoDB](https://repo.mongodb.org/apt/ubuntu)
[Mono](https://download.mono-project.com/repo/ubuntu)
[MS Edge](https://packages.microsoft.com/repos/edge)
[PostgreSQL](https://apt.postgresql.org/pub/repos/apt/)
[R](https://cloud.r-project.org/bin/linux/ubuntu) | | | [pipx](https://pypa.github.io/pipx) | ansible-core
yamllint | | Windows | [Chocolatey](https://chocolatey.org) | No third-party repos installed | | macOS | [Homebrew](https://brew.sh) | [aws-cli v2](https://github.com/aws/homebrew-tap)
[azure/bicep](https://github.com/Azure/homebrew-bicep)
[mongodb/brew](https://github.com/mongodb/homebrew-brew) | diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 6effcf51b..faa3ad211 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -164,7 +164,7 @@ Function GenerateResourcesAndImage { # Prepare list of allowed inbound IP addresses if ($RestrictToAgentIpAddress) { - $AgentIp = (Invoke-RestMethod http://ipinfo.io/json).ip + $AgentIp = (Invoke-RestMethod https://ipinfo.io/json).ip if (-not $AgentIp) { throw "Unable to determine agent IP address." } diff --git a/images/macos/assets/bootstrap-provisioner/kcpassword.py b/images/macos/assets/bootstrap-provisioner/kcpassword.py index 8b50a3e26..09d585bdd 100755 --- a/images/macos/assets/bootstrap-provisioner/kcpassword.py +++ b/images/macos/assets/bootstrap-provisioner/kcpassword.py @@ -2,7 +2,7 @@ # Port of Gavin Brock's Perl kcpassword generator to Python, by Tom Taylor # . -# Perl version: http://www.brock-family.org/gavin/perl/kcpassword.html +# Perl version: https://www.brock-family.org/gavin/perl/kcpassword.html # This script was taken from https://github.com/timsutton/osx-vm-templates/blob/master/scripts/support/set_kcpassword.py # Distributed by MIT license, license can be found at the bottom of this script @@ -45,4 +45,4 @@ Copyright (c) 2013-2017 Timothy Sutton Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -""" \ No newline at end of file +""" diff --git a/images/macos/scripts/build/configure-hostname.sh b/images/macos/scripts/build/configure-hostname.sh index 7b44557ec..58c535cc6 100644 --- a/images/macos/scripts/build/configure-hostname.sh +++ b/images/macos/scripts/build/configure-hostname.sh @@ -18,7 +18,7 @@ chmod +x /usr/local/bin/change_hostname.sh sudo tee -a /Library/LaunchDaemons/change_hostname.plist > /dev/null <<\EOF - + Label diff --git a/images/macos/scripts/build/install-edge.sh b/images/macos/scripts/build/install-edge.sh index c42378734..6c2d4e683 100644 --- a/images/macos/scripts/build/install-edge.sh +++ b/images/macos/scripts/build/install-edge.sh @@ -42,7 +42,7 @@ sudo mkdir "/Library/Managed Preferences" cat < /dev/null - + updatePolicies diff --git a/images/ubuntu/scripts/build/configure-apt-sources.sh b/images/ubuntu/scripts/build/configure-apt-sources.sh index 1e6c98220..03b1c0302 100644 --- a/images/ubuntu/scripts/build/configure-apt-sources.sh +++ b/images/ubuntu/scripts/build/configure-apt-sources.sh @@ -9,16 +9,16 @@ source $HELPER_SCRIPTS/os.sh touch /etc/apt/apt-mirrors.txt printf "http://azure.archive.ubuntu.com/ubuntu/\tpriority:1\n" | tee -a /etc/apt/apt-mirrors.txt -printf "http://archive.ubuntu.com/ubuntu/\tpriority:2\n" | tee -a /etc/apt/apt-mirrors.txt -printf "http://security.ubuntu.com/ubuntu/\tpriority:3\n" | tee -a /etc/apt/apt-mirrors.txt +printf "https://archive.ubuntu.com/ubuntu/\tpriority:2\n" | tee -a /etc/apt/apt-mirrors.txt +printf "https://security.ubuntu.com/ubuntu/\tpriority:3\n" | tee -a /etc/apt/apt-mirrors.txt if is_ubuntu24; then - sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list.d/ubuntu.sources + sed -i 's/https:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list.d/ubuntu.sources # Apt changes to survive Cloud Init cp -f /etc/apt/sources.list.d/ubuntu.sources /etc/cloud/templates/sources.list.ubuntu.deb822.tmpl else - sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list + sed -i 's/https:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list # Apt changes to survive Cloud Init cp -f /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl diff --git a/images/ubuntu/scripts/build/configure-apt.sh b/images/ubuntu/scripts/build/configure-apt.sh index c75bcc3bd..10af849e3 100644 --- a/images/ubuntu/scripts/build/configure-apt.sh +++ b/images/ubuntu/scripts/build/configure-apt.sh @@ -31,6 +31,8 @@ echo 'APT::Get::Always-Include-Phased-Updates "true";' > /etc/apt/apt.conf.d/99- cat <> /etc/apt/apt.conf.d/99bad_proxy Acquire::http::Pipeline-Depth 0; Acquire::http::No-Cache true; +Acquire::https::Pipeline-Depth 0; +Acquire::https::No-Cache true; Acquire::BrokenProxy true; EOF diff --git a/images/ubuntu/scripts/build/configure-dpkg.sh b/images/ubuntu/scripts/build/configure-dpkg.sh index 39eaf4647..bff62a932 100644 --- a/images/ubuntu/scripts/build/configure-dpkg.sh +++ b/images/ubuntu/scripts/build/configure-dpkg.sh @@ -33,6 +33,10 @@ EOF # Install libicu70 package for Ubuntu 24 if is_ubuntu24 ; then - wget http://archive.ubuntu.com/ubuntu/pool/main/i/icu/libicu70_70.1-2_amd64.deb + wget https://archive.ubuntu.com/ubuntu/pool/main/i/icu/libicu70_70.1-2_amd64.deb + + EXPECTED_LIBICU_SHA512="a6315482d93606e375c272718d2458870b95e4ed4b672ea8640cf7bc2d2c2f41aea13b798b1e417e1ffc472a90c6aad150d3d293aa9bddec48e39106e4042807" + ACTUAL_LIBICU_SHA512="$(sha512sum "./libicu70_70.1-2_amd64.deb" | awk '{print $1}')" + [ "$EXPECTED_LIBICU_SHA512" = "$ACTUAL_LIBICU_SHA512" ] || { echo "libicu checksum mismatch in configure-dpkg.sh"; exit 1;} sudo apt-get install -y ./libicu70_70.1-2_amd64.deb fi diff --git a/images/ubuntu/scripts/build/install-erlang.sh b/images/ubuntu/scripts/build/install-erlang.sh index 335070c77..f2d3e9733 100644 --- a/images/ubuntu/scripts/build/install-erlang.sh +++ b/images/ubuntu/scripts/build/install-erlang.sh @@ -12,7 +12,7 @@ source_key=/usr/share/keyrings/eslerlang.gpg # Install Erlang wget -q -O - https://binaries2.erlang-solutions.com/GPG-KEY-pmanager.asc | gpg --dearmor > $source_key -echo "deb [signed-by=$source_key] http://binaries2.erlang-solutions.com/ubuntu $(lsb_release -cs)-esl-erlang-25 contrib" > $source_list +echo "deb [signed-by=$source_key] https://binaries2.erlang-solutions.com/ubuntu $(lsb_release -cs)-esl-erlang-25 contrib" > $source_list apt-get update apt-get install --no-install-recommends esl-erlang diff --git a/images/ubuntu/scripts/build/install-firefox.sh b/images/ubuntu/scripts/build/install-firefox.sh index 0d59ebdf6..b5538e2fe 100644 --- a/images/ubuntu/scripts/build/install-firefox.sh +++ b/images/ubuntu/scripts/build/install-firefox.sh @@ -11,7 +11,7 @@ source $HELPER_SCRIPTS/etc-environment.sh # Mozillateam PPA is added manually because sometimes # launchpad portal sends empty answer when trying to add it automatically -REPO_URL="http://ppa.launchpad.net/mozillateam/ppa/ubuntu" +REPO_URL="https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/" GPG_FINGERPRINT="0ab215679c571d1c8325275b9bdb3d89ce49ec21" GPG_KEY="/etc/apt/trusted.gpg.d/mozillateam_ubuntu_ppa.gpg" REPO_PATH="/etc/apt/sources.list.d/mozillateam-ubuntu-ppa-focal.list" diff --git a/images/ubuntu/scripts/build/install-sqlpackage.sh b/images/ubuntu/scripts/build/install-sqlpackage.sh index b9c979e85..4a2aec198 100644 --- a/images/ubuntu/scripts/build/install-sqlpackage.sh +++ b/images/ubuntu/scripts/build/install-sqlpackage.sh @@ -11,7 +11,7 @@ source $HELPER_SCRIPTS/os.sh # Install libssl1.1 dependency if is_ubuntu22; then focal_list=/etc/apt/sources.list.d/focal-security.list - echo "deb http://archive.ubuntu.com/ubuntu/ focal-security main" | tee "${focal_list}" + echo "deb https://archive.ubuntu.com/ubuntu/ focal-security main" | tee "${focal_list}" apt-get update --quiet apt-get install --no-install-recommends libssl1.1 diff --git a/images/windows/scripts/build/Install-WebPlatformInstaller.ps1 b/images/windows/scripts/build/Install-WebPlatformInstaller.ps1 index 5c7c6fb7d..0b6e6cac2 100644 --- a/images/windows/scripts/build/Install-WebPlatformInstaller.ps1 +++ b/images/windows/scripts/build/Install-WebPlatformInstaller.ps1 @@ -4,7 +4,7 @@ ################################################################################ Install-Binary -Type MSI ` - -Url 'http://go.microsoft.com/fwlink/?LinkId=287166' ` + -Url 'https://go.microsoft.com/fwlink/?LinkId=287166' ` -ExpectedSignature 'C3A3D43788E7ABCD287CB4F5B6583043774F99D2' Invoke-PesterTests -TestFile "Tools" -TestName "WebPlatformInstaller" diff --git a/schemas/toolset-schema.json b/schemas/toolset-schema.json index f9bf71b96..6b7fa8d68 100644 --- a/schemas/toolset-schema.json +++ b/schemas/toolset-schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft-07/schema#", "type": "object", "patternProperties": { "^.*$": {