Skip to content

Commit 19c889b

Browse files
Fix deps builds (#21019) (#21033)
* Change mirror for krb5 source * Pin vcpkg to try to fix zlib build error * Pin vs buildtools * Add reference to bootstrapper source in dockerfile comment (cherry picked from commit 0e34600) Co-authored-by: Alex Lopez <[email protected]>
1 parent 841f76a commit 19c889b

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.builders/images/linux-aarch64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ENV PATH="/root/.cargo/bin:${PATH}"
6868

6969
# krb5 for dependencies that require kerberos support
7070
RUN \
71-
DOWNLOAD_URL="https://kerberos.org/dist/krb5/1.20/krb5-{{version}}.tar.gz" \
71+
DOWNLOAD_URL="https://web.mit.edu/kerberos/dist/krb5/1.20/krb5-1.20.1.tar.gz" \
7272
VERSION="1.20.1" \
7373
SHA256="704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851" \
7474
RELATIVE_PATH="krb5-{{version}}/src" \

.builders/images/linux-x86_64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ RUN mkdir -p /opt/mqm \
7272

7373
# krb5 for dependencies that require kerberos support
7474
RUN \
75-
DOWNLOAD_URL="https://kerberos.org/dist/krb5/1.20/krb5-{{version}}.tar.gz" \
75+
DOWNLOAD_URL="https://web.mit.edu/kerberos/dist/krb5/1.20/krb5-1.20.1.tar.gz" \
7676
VERSION="1.20.1" \
7777
SHA256="704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851" \
7878
RELATIVE_PATH="krb5-{{version}}/src" \

.builders/images/windows-x86_64/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ SHELL ["cmd", "/S", "/C"]
1313

1414
# https://learn.microsoft.com/en-us/visualstudio/install/build-tools-container#create-and-build-the-dockerfile
1515
# https://learn.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools
16-
RUN curl -SL --output vs_buildtools.exe https://aka.ms/vs/17/release/vs_buildtools.exe `
16+
# Bootstrapper version pinned to 17.12.36227.10 (taken from learn.microsoft.com/en-us/visualstudio/releases/2022/release-history#fixed-version-bootstrappers)
17+
RUN curl -SL --output vs_buildtools.exe https://download.visualstudio.microsoft.com/download/pr/87b94407-0aa3-45fc-b53f-d224027a42b3/00e8cad9ef34839c57f9be8bc4f93c517804777bdef770e8dbdc8ba0e06bc348/vs_BuildTools.exe `
1718
&& (start /w vs_buildtools.exe --quiet --wait --norestart --nocache `
1819
--installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" `
1920
--add Microsoft.VisualStudio.Component.VC.140 `

.builders/images/windows-x86_64/build_script.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Remove-Item "librdkafka-${kafka_version}.tar.gz"
2424
$triplet = "x64-windows"
2525
$vcpkg_dir = "C:\vcpkg"
2626
$librdkafka_dir = "C:\librdkafka\librdkafka-${kafka_version}"
27-
$desired_commit = "master" # Set the commit to master so we don't have to update manually
27+
$desired_commit = "9a023fa7d4c8c9ed3fa5b1be466e605b10b9d220"
2828

2929
# Clone and configure vcpkg
3030
if (-Not (Test-Path -Path "$vcpkg_dir\.git")) {

0 commit comments

Comments
 (0)