Skip to content

Commit f9460fa

Browse files
committed
test remove rust image
1 parent c3a01fe commit f9460fa

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

.github/workflows/release-reproducible.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,10 @@ jobs:
3939
include:
4040
- arch: amd64
4141
rust_target: x86_64-unknown-linux-gnu
42-
rust_image: >-
43-
rust:1.88-bullseye@sha256:8e3c421122bf4cd3b2a866af41a4dd52d87ad9e315fd2cb5100e87a7187a9816
4442
platform: linux/amd64
4543
runner: ubuntu-latest
4644
- arch: arm64
4745
rust_target: aarch64-unknown-linux-gnu
48-
rust_image: >-
49-
rust:1.88-bullseye@sha256:8b22455a7ce2adb1355067638284ee99d21cc516fab63a96c4514beaf370aa94
5046
platform: linux/arm64
5147
runner: ubuntu-24.04-arm
5248
runs-on: ${{ matrix.runner }}
@@ -67,7 +63,6 @@ jobs:
6763
docker build -f Dockerfile.reproducible \
6864
--platform ${{ matrix.platform }} \
6965
--build-arg RUST_TARGET="${{ matrix.rust_target }}" \
70-
--build-arg RUST_IMAGE="${{ matrix.rust_image }}" \
7166
-t lighthouse-verify-1-${{ matrix.arch }} .
7267
7368
# Extract binary from first build
@@ -84,7 +79,6 @@ jobs:
8479
docker build -f Dockerfile.reproducible \
8580
--platform ${{ matrix.platform }} \
8681
--build-arg RUST_TARGET="${{ matrix.rust_target }}" \
87-
--build-arg RUST_IMAGE="${{ matrix.rust_image }}" \
8882
-t lighthouse-verify-2-${{ matrix.arch }} .
8983
9084
# Extract binary from second build

.github/workflows/reproducible-build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
echo "=== Building first Docker image (x86_64) ==="
3636
docker build -f Dockerfile.reproducible \
3737
--build-arg RUST_TARGET="x86_64-unknown-linux-gnu" \
38-
--build-arg RUST_IMAGE="rust:1.88-bullseye@sha256:8e3c421122bf4cd3b2a866af41a4dd52d87ad9e315fd2cb5100e87a7187a9816" \
3938
-t build-lighthouse-1 .
4039
4140
echo "=== Extracting binary from first build ==="
@@ -70,7 +69,6 @@ jobs:
7069
echo "=== Building second Docker image (x86_64) ==="
7170
docker build -f Dockerfile.reproducible \
7271
--build-arg RUST_TARGET="x86_64-unknown-linux-gnu" \
73-
--build-arg RUST_IMAGE="rust:1.88-bullseye@sha256:8e3c421122bf4cd3b2a866af41a4dd52d87ad9e315fd2cb5100e87a7187a9816" \
7472
-t build-lighthouse-2 .
7573
7674
echo "=== Extracting binary from second build ==="
@@ -127,7 +125,6 @@ jobs:
127125
docker build -f Dockerfile.reproducible \
128126
--platform linux/arm64 \
129127
--build-arg RUST_TARGET="aarch64-unknown-linux-gnu" \
130-
--build-arg RUST_IMAGE="rust:1.88-bullseye@sha256:8b22455a7ce2adb1355067638284ee99d21cc516fab63a96c4514beaf370aa94" \
131128
-t build-lighthouse-1-arm64 .
132129
133130
echo "=== Extracting binary from first build ==="
@@ -158,7 +155,6 @@ jobs:
158155
docker build -f Dockerfile.reproducible \
159156
--platform linux/arm64 \
160157
--build-arg RUST_TARGET="aarch64-unknown-linux-gnu" \
161-
--build-arg RUST_IMAGE="rust:1.88-bullseye@sha256:8b22455a7ce2adb1355067638284ee99d21cc516fab63a96c4514beaf370aa94" \
162158
-t build-lighthouse-2-arm64 .
163159
164160
echo "=== Extracting binary from second build ==="

Dockerfile.reproducible

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Define the Rust image as an argument with a default to x86_64 Rust 1.88 image based on Debian Bullseye
2-
ARG RUST_IMAGE="rust:1.88-bullseye@sha256:8e3c421122bf4cd3b2a866af41a4dd52d87ad9e315fd2cb5100e87a7187a9816"
1+
# Define the Rust image as an argument with a default (multi-arch tag automatically selects the correct platform)
2+
ARG RUST_IMAGE="rust:1.88.0-bullseye"
33
FROM ${RUST_IMAGE} AS builder
44

55
# Install specific version of the build dependencies

0 commit comments

Comments
 (0)