@@ -93,8 +93,8 @@ RUN --network=default \
93
93
RUN --network=default \
94
94
rustup target add \
95
95
--toolchain "${RUSTC_VERSION}" \
96
- x86_64-unknown-linux-musl \
97
- aarch64-unknown-linux-musl
96
+ x86_64-unknown-linux-gnu \
97
+ aarch64-unknown-linux-gnu
98
98
99
99
# Set the working directory
100
100
WORKDIR /app
@@ -124,8 +124,8 @@ RUN --network=default \
124
124
--recipe-path recipe.json \
125
125
--no-default-features \
126
126
--features docker \
127
- --target x86_64-unknown-linux-musl \
128
- --target aarch64-unknown-linux-musl \
127
+ --target x86_64-unknown-linux-gnu \
128
+ --target aarch64-unknown-linux-gnu \
129
129
--package mas-cli
130
130
131
131
# Build the rest
@@ -140,14 +140,14 @@ RUN --network=default \
140
140
--bin mas-cli \
141
141
--no-default-features \
142
142
--features docker \
143
- --target x86_64-unknown-linux-musl \
144
- --target aarch64-unknown-linux-musl
143
+ --target x86_64-unknown-linux-gnu \
144
+ --target aarch64-unknown-linux-gnu
145
145
146
146
# Move the binary to avoid having to guess its name in the next stage
147
147
RUN --network=none \
148
- mv "target/x86_64-unknown-linux-musl /release/mas-cli" /usr/local/bin/mas-cli-amd64
148
+ mv "target/x86_64-unknown-linux-gnu /release/mas-cli" /usr/local/bin/mas-cli-amd64
149
149
RUN --network=none \
150
- mv "target/aarch64-unknown-linux-musl /release/mas-cli" /usr/local/bin/mas-cli-arm64
150
+ mv "target/aarch64-unknown-linux-gnu /release/mas-cli" /usr/local/bin/mas-cli-arm64
151
151
152
152
# ######################################
153
153
# # Prepare /usr/local/share/mas-cli/ ##
@@ -162,7 +162,7 @@ COPY ./translations/ /share/translations
162
162
# #################################
163
163
# # Runtime stage, debug variant ##
164
164
# #################################
165
- FROM --platform=${TARGETPLATFORM} gcr.io/distroless/static -debian${DEBIAN_VERSION}:debug-nonroot AS debug
165
+ FROM --platform=${TARGETPLATFORM} gcr.io/distroless/base-nossl -debian${DEBIAN_VERSION}:debug-nonroot AS debug
166
166
167
167
ARG TARGETARCH
168
168
COPY --from=builder /usr/local/bin/mas-cli-${TARGETARCH} /usr/local/bin/mas-cli
@@ -174,7 +174,7 @@ ENTRYPOINT ["/usr/local/bin/mas-cli"]
174
174
# ##################
175
175
# # Runtime stage ##
176
176
# ##################
177
- FROM --platform=${TARGETPLATFORM} gcr.io/distroless/static -debian${DEBIAN_VERSION}:nonroot
177
+ FROM --platform=${TARGETPLATFORM} gcr.io/distroless/base-nossl -debian${DEBIAN_VERSION}:nonroot
178
178
179
179
ARG TARGETARCH
180
180
COPY --from=builder /usr/local/bin/mas-cli-${TARGETARCH} /usr/local/bin/mas-cli
0 commit comments