diff --git a/.builders/images/linux-aarch64/Dockerfile b/.builders/images/linux-aarch64/Dockerfile index c8d618f10b737..0c027eb0640d6 100644 --- a/.builders/images/linux-aarch64/Dockerfile +++ b/.builders/images/linux-aarch64/Dockerfile @@ -68,7 +68,7 @@ ENV PATH="/root/.cargo/bin:${PATH}" # krb5 for dependencies that require kerberos support RUN \ - DOWNLOAD_URL="https://kerberos.org/dist/krb5/1.20/krb5-{{version}}.tar.gz" \ + DOWNLOAD_URL="https://web.mit.edu/kerberos/dist/krb5/1.20/krb5-1.20.1.tar.gz" \ VERSION="1.20.1" \ SHA256="704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851" \ RELATIVE_PATH="krb5-{{version}}/src" \ diff --git a/.builders/images/linux-x86_64/Dockerfile b/.builders/images/linux-x86_64/Dockerfile index ed9e1d488c8d2..2459570ab4447 100644 --- a/.builders/images/linux-x86_64/Dockerfile +++ b/.builders/images/linux-x86_64/Dockerfile @@ -72,7 +72,7 @@ RUN mkdir -p /opt/mqm \ # krb5 for dependencies that require kerberos support RUN \ - DOWNLOAD_URL="https://kerberos.org/dist/krb5/1.20/krb5-{{version}}.tar.gz" \ + DOWNLOAD_URL="https://web.mit.edu/kerberos/dist/krb5/1.20/krb5-1.20.1.tar.gz" \ VERSION="1.20.1" \ SHA256="704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851" \ RELATIVE_PATH="krb5-{{version}}/src" \ diff --git a/.builders/images/windows-x86_64/Dockerfile b/.builders/images/windows-x86_64/Dockerfile index 2035cd722bb2c..f2a39d6429946 100644 --- a/.builders/images/windows-x86_64/Dockerfile +++ b/.builders/images/windows-x86_64/Dockerfile @@ -13,7 +13,8 @@ SHELL ["cmd", "/S", "/C"] # https://learn.microsoft.com/en-us/visualstudio/install/build-tools-container#create-and-build-the-dockerfile # https://learn.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools -RUN curl -SL --output vs_buildtools.exe https://aka.ms/vs/17/release/vs_buildtools.exe ` +# Bootstrapper version pinned to 17.12.36227.10 (taken from learn.microsoft.com/en-us/visualstudio/releases/2022/release-history#fixed-version-bootstrappers) +RUN curl -SL --output vs_buildtools.exe https://download.visualstudio.microsoft.com/download/pr/87b94407-0aa3-45fc-b53f-d224027a42b3/00e8cad9ef34839c57f9be8bc4f93c517804777bdef770e8dbdc8ba0e06bc348/vs_BuildTools.exe ` && (start /w vs_buildtools.exe --quiet --wait --norestart --nocache ` --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" ` --add Microsoft.VisualStudio.Component.VC.140 ` diff --git a/.builders/images/windows-x86_64/build_script.ps1 b/.builders/images/windows-x86_64/build_script.ps1 index 9f0f0cb1c00ed..639d97dd223dd 100644 --- a/.builders/images/windows-x86_64/build_script.ps1 +++ b/.builders/images/windows-x86_64/build_script.ps1 @@ -24,7 +24,7 @@ Remove-Item "librdkafka-${kafka_version}.tar.gz" $triplet = "x64-windows" $vcpkg_dir = "C:\vcpkg" $librdkafka_dir = "C:\librdkafka\librdkafka-${kafka_version}" -$desired_commit = "master" # Set the commit to master so we don't have to update manually +$desired_commit = "9a023fa7d4c8c9ed3fa5b1be466e605b10b9d220" # Clone and configure vcpkg if (-Not (Test-Path -Path "$vcpkg_dir\.git")) {