@@ -13,7 +13,7 @@ ARG RUSTC_VERSION=1.73.0
1313# XXX: Upgrade to 0.11.0 blocked by https://github.com/rust-cross/cargo-zigbuild/issues/162
1414ARG ZIG_VERSION=0.9.1
1515ARG NODEJS_VERSION=20.9.0
16- ARG OPA_VERSION=0.58 .0
16+ ARG OPA_VERSION=0.59 .0
1717ARG CARGO_AUDITABLE_VERSION=0.6.1
1818ARG CARGO_CHEF_VERSION=0.1.62
1919ARG CARGO_ZIGBUILD_VERSION=0.17.5
@@ -78,9 +78,9 @@ ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
7878# Network access: to fetch dependencies
7979RUN --network=default \
8080 cargo install --locked \
81- cargo-chef@=${CARGO_CHEF_VERSION} \
82- cargo-zigbuild@=${CARGO_ZIGBUILD_VERSION} \
83- cargo-auditable@=${CARGO_AUDITABLE_VERSION}
81+ cargo-chef@=${CARGO_CHEF_VERSION} \
82+ cargo-zigbuild@=${CARGO_ZIGBUILD_VERSION} \
83+ cargo-auditable@=${CARGO_AUDITABLE_VERSION}
8484
8585# Download zig compiler for cross-compilation
8686# Network access: to download zig
@@ -92,9 +92,9 @@ RUN --network=default \
9292# Network access: to download the targets
9393RUN --network=default \
9494 rustup target add \
95- --toolchain "${RUSTC_VERSION}" \
96- x86_64-unknown-linux-musl \
97- aarch64-unknown-linux-musl
95+ --toolchain "${RUSTC_VERSION}" \
96+ x86_64-unknown-linux-musl \
97+ aarch64-unknown-linux-musl
9898
9999# Set the working directory
100100WORKDIR /app
@@ -106,7 +106,7 @@ FROM --platform=${BUILDPLATFORM} toolchain AS planner
106106COPY ./Cargo.toml ./Cargo.lock /app/
107107COPY ./crates /app/crates
108108RUN --network=none \
109- cargo chef prepare --recipe-path recipe.json --bin crates/cli
109+ cargo chef prepare --recipe-path recipe.json --bin crates/cli
110110
111111# #######################
112112# # Actual build stage ##
@@ -118,15 +118,15 @@ COPY --from=planner /app/recipe.json recipe.json
118118# Network access: cargo-chef cook fetches the dependencies
119119RUN --network=default \
120120 cargo chef cook \
121- --zigbuild \
122- --bin mas-cli \
123- --release \
124- --recipe-path recipe.json \
125- --no-default-features \
126- --features docker \
127- --target x86_64-unknown-linux-musl \
128- --target aarch64-unknown-linux-musl \
129- --package mas-cli
121+ --zigbuild \
122+ --bin mas-cli \
123+ --release \
124+ --recipe-path recipe.json \
125+ --no-default-features \
126+ --features docker \
127+ --target x86_64-unknown-linux-musl \
128+ --target aarch64-unknown-linux-musl \
129+ --package mas-cli
130130
131131# Build the rest
132132COPY ./Cargo.toml ./Cargo.lock /app/
@@ -135,13 +135,13 @@ ENV SQLX_OFFLINE=true
135135# Network access: cargo auditable needs it
136136RUN --network=default \
137137 cargo auditable zigbuild \
138- --locked \
139- --release \
140- --bin mas-cli \
141- --no-default-features \
142- --features docker \
143- --target x86_64-unknown-linux-musl \
144- --target aarch64-unknown-linux-musl
138+ --locked \
139+ --release \
140+ --bin mas-cli \
141+ --no-default-features \
142+ --features docker \
143+ --target x86_64-unknown-linux-musl \
144+ --target aarch64-unknown-linux-musl
145145
146146# Move the binary to avoid having to guess its name in the next stage
147147RUN --network=none \
0 commit comments