Skip to content

Commit bfb54b0

Browse files
committed
Use latest openssl from upstream bookworm
Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent 5ba629a commit bfb54b0

5 files changed

Lines changed: 16 additions & 8 deletions

File tree

bazel/cc_toolchains/sysroots/sysroots.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ load("//bazel/cc_toolchains:utils.bzl", "abi")
2020
SYSROOT_LOCATIONS = dict(
2121
sysroot_x86_64_glibc2_36_runtime = dict(
2222
sha256 = "0f6c8147394c41a5c10715d0859ca2ef6e03d65a52b5959f6e11f1de7513f3a4",
23+
sha256 = "a13c96cce26f9603fb99b5ef262f65a5ee85b9cac7817024a209bd5402f600ca",
2324
strip_prefix = "",
2425
urls = [
25-
"https://github.com/pixie-io/dev-artifacts/releases/download/sysroots%2Fpl8/sysroot-amd64-runtime.tar.gz",
26-
"https://storage.googleapis.com/pixie-dev-public/sysroots/pl8/sysroot-amd64-runtime.tar.gz",
26+
"https://github.com/ddelnano/dev-artifacts/releases/download/sysroots%2Fpl13/sysroot-amd64-runtime.tar.gz",
2727
],
2828
),
2929
sysroot_x86_64_glibc2_36_build = dict(

scripts/create_release_for_dev_artifact.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717
# SPDX-License-Identifier: Apache-2.0
1818

19-
repo="pixie-io/dev-artifacts"
19+
repo="ddelnano/dev-artifacts"
2020

2121
if [[ $# -lt 3 ]]; then
2222
echo "Usage: $0 <release-name> <version> [<artifact>...]"
@@ -30,7 +30,7 @@ artifacts=( "${@:3}" )
3030
tag_name="${release_name}/${version}"
3131

3232
repo_dir="$(mktemp -d)"
33-
git clone git@github.com:pixie-io/dev-artifacts.git "${repo_dir}"
33+
git clone git@github.com:ddelnano/dev-artifacts.git "${repo_dir}"
3434

3535
pushd "${repo_dir}" &> /dev/null
3636
git tag "${tag_name}"

tools/docker/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ GRAALVM_ARCHIVE_FNAME := graalvm-native-image-22.3.0.tar.gz
6060
GRAALVM_ARCHIVE_GS_PATH := gs://pixie-dev-public/graalvm-native-image-22.3.0-$(GRAALVM_IMAGE_VERSION).tar.gz
6161

6262
## Sysroot parameters
63-
SYSROOT_REV := pl8
63+
SYSROOT_REV := pl14
6464
SYSROOT_BUILD_DIR := $(BUILD_DIR)/sysroots
6565
SYSROOT_ARCHITECTURES := amd64 arm64
6666
SYSROOT_VARIANTS := runtime build test
@@ -266,7 +266,7 @@ build_all_sysroots: sysroot_creator/Dockerfile sysroot_creator/build_all_sysroot
266266

267267
.PHONY: upload_all_sysroots
268268
upload_all_sysroots: build_all_sysroots
269-
gsutil cp $(SYSROOT_BUILD_DIR)/* $(SYSROOT_GS_PATH)
269+
# gsutil cp $(SYSROOT_BUILD_DIR)/* $(SYSROOT_GS_PATH)
270270
$(GH_RELEASE_UPLOAD) sysroots $(SYSROOT_REV) $(SYSROOT_BUILD_DIR)/*
271271
sha256sum $(SYSROOT_BUILD_DIR)/*
272272

tools/docker/sysroot_creator/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
FROM debian:bookworm@sha256:ee71fe8b4093251ca8462c29b2d78cdb491fd124a20350c89cd3456a43324a73
1818

1919
RUN apt-get update -y && \
20-
apt-get install -y golang curl xz-utils
20+
apt-get install -y curl xz-utils
21+
22+
RUN curl -fL https://go.dev/dl/go1.23.8.linux-amd64.tar.gz | tar -C /usr/local -xz
23+
ENV PATH="/usr/local/go/bin:${PATH}"
2124

2225
RUN curl -L https://github.com/mikefarah/yq/releases/download/v4.30.8/yq_linux_amd64 -o /bin/yq && \
2326
chmod +x /bin/yq

tools/docker/sysroot_creator/build_tar_for_packages.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ if [ "$#" -lt 4 ]; then
2828
fi
2929

3030
debian_mirror="${DEBIAN_MIRROR:-http://ftp.us.debian.org/debian/}"
31+
debian_security_mirror="${DEBIAN_SECURITY_MIRROR:-http://security.debian.org/debian-security/}"
3132

3233
package_satisifier_path="$(realpath "$1")"
3334
package_database_file="$(realpath "$2")"
@@ -40,7 +41,11 @@ done
4041

4142
debs=()
4243
while read -r deb; do
43-
debs+=("${debian_mirror}/${deb}")
44+
if [[ "${deb}" == pool/updates/* ]]; then
45+
debs+=("${debian_security_mirror}/${deb}")
46+
else
47+
debs+=("${debian_mirror}/${deb}")
48+
fi
4449
done < <("${package_satisifier_path}" "${package_parser_args[@]}")
4550

4651
echo "Dependencies to be added to archive:"

0 commit comments

Comments
 (0)