Skip to content

Commit 3b786d3

Browse files
committed
chore(ci): update rust build toolchain
1 parent d118174 commit 3b786d3

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

.drone/drone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
- commands:
99
- uname -a
1010
- make test
11-
image: pyroscope/rust_builder_cli:2
11+
image: pyroscope/rust_builder_cli:3
1212
name: make cli/test
1313
trigger:
1414
event:
@@ -24,7 +24,7 @@ steps:
2424
- commands:
2525
- uname -a
2626
- make test
27-
image: pyroscope/rust_builder_cli:2
27+
image: pyroscope/rust_builder_cli:3
2828
name: make cli/test
2929
trigger:
3030
event:

docker/Dockerfile.cli

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM pyroscope/rust_builder_cli:2 as builder
1+
FROM pyroscope/rust_builder_cli:3 as builder
22

33
WORKDIR /app
44
ADD pyroscope_backends ./pyroscope_backends
@@ -17,4 +17,4 @@ FROM scratch as final
1717

1818
COPY --from=builder /app/pyroscope_cli/target/release/pyroscope-cli /pyroscope-cli
1919

20-
ENTRYPOINT ["/pyroscope-cli"]
20+
ENTRYPOINT ["/pyroscope-cli"]

docker/Dockerfile.cli_builder

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN case "${TARGETPLATFORM}" in \
2020
RUN source ./.env && \
2121
wget https://static.rust-lang.org/rustup/dist/${RUST_TARGET}/rustup-init && \
2222
chmod +x rustup-init && \
23-
./rustup-init -y --default-toolchain=1.64.0 --default-host=${RUST_TARGET}
23+
./rustup-init -y --default-toolchain=1.76.0 --default-host=${RUST_TARGET}
2424
ENV PATH=/root/.cargo/bin:$PATH
2525

2626

@@ -34,9 +34,9 @@ RUN source ./.env && \
3434
make install
3535

3636
RUN source ./.env && \
37-
wget https://zlib.net/zlib-1.2.13.tar.gz && \
38-
tar -zxvf zlib-1.2.13.tar.gz && \
39-
cd zlib-1.2.13 && \
37+
wget https://zlib.net/zlib-1.3.1.tar.gz && \
38+
tar -zxvf zlib-1.3.1.tar.gz && \
39+
cd zlib-1.3.1 && \
4040
./configure --prefix=/usr/local/musl/${RUST_TARGET} && \
4141
make -j16 && \
4242
make install

docker/Dockerfile.manylinux2014_aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM --platform=linux/aarch64 quay.io/pypa/manylinux2014_aarch64
33

44
RUN curl https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-musl/rustup-init -o ./rustup-init \
55
&& chmod +x ./rustup-init \
6-
&& ./rustup-init -y --default-toolchain=1.64.0 --default-host=aarch64-unknown-linux-gnu
6+
&& ./rustup-init -y --default-toolchain=1.76.0 --default-host=aarch64-unknown-linux-gnu
77
ENV PATH=/root/.cargo/bin:$PATH
88
RUN yum -y install gcc libffi-devel openssl-devel wget
99

docker/Dockerfile.manylinux2014_x86_64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM --platform=linux/amd64 quay.io/pypa/manylinux2014_x86_64
33

44
RUN curl https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-musl/rustup-init -o ./rustup-init \
55
&& chmod +x ./rustup-init \
6-
&& ./rustup-init -y --default-toolchain=1.64.0 --default-host=x86_64-unknown-linux-gnu
6+
&& ./rustup-init -y --default-toolchain=1.76.0 --default-host=x86_64-unknown-linux-gnu
77
ENV PATH=/root/.cargo/bin:$PATH
88
RUN yum -y install gcc libffi-devel openssl-devel wget
99

docker/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PREFIX ?= pyroscope/rust_builder
2-
CLI_BUILDER_VERSION ?= 2
3-
MANYLINUX_VERSION ?= 3
2+
CLI_BUILDER_VERSION ?= 3
3+
MANYLINUX_VERSION ?= 4
44

55
.PHONY: push_x86_64
66
push_x86_64:

docker/build-container.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
# variable names should be passed through to the container.
3535

3636
USE_CONTAINER ?= 0
37-
BUILD_IMAGE_VERSION ?= 2
37+
BUILD_IMAGE_VERSION ?= 3
3838
BUILD_IMAGE ?= pyroscope/rust_builder_cli:$(BUILD_IMAGE_VERSION)
3939
DOCKER_OPTS ?=
4040

pyroscope_ffi/python/scripts/docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fi
99

1010
BUILD_DIR="/work"
1111
MANYLINUX_PREFIX=pyroscope/rust_builder
12-
MANYLINUX_VERSION=3
12+
MANYLINUX_VERSION=4
1313

1414
docker run \
1515
-w /work/pyroscope_ffi/python \

pyroscope_ffi/ruby/scripts/docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fi
99

1010
BUILD_DIR="/work"
1111
MANYLINUX_PREFIX=pyroscope/rust_builder
12-
MANYLINUX_VERSION=3
12+
MANYLINUX_VERSION=4
1313

1414
docker run \
1515
-w /work/pyroscope_ffi/ruby/elflib/rbspy \

0 commit comments

Comments
 (0)