Browse Source
Merge branch 'main' into feature/custom-role-permissions
pull/7397/head
Tom
1 day ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
2 additions and
2 deletions
-
docker/Dockerfile.alpine
-
docker/Dockerfile.j2
|
|
@ -66,7 +66,7 @@ RUN USER=root cargo new --bin /app |
|
|
WORKDIR /app |
|
|
WORKDIR /app |
|
|
|
|
|
|
|
|
# Environment variables for Cargo on Alpine based builds |
|
|
# Environment variables for Cargo on Alpine based builds |
|
|
RUN echo "export CARGO_TARGET=${RUST_MUSL_CROSS_TARGET}" >> /env-cargo && \ |
|
|
RUN echo "export CARGO_TARGET=${CARGO_BUILD_TARGET}" >> /env-cargo && \ |
|
|
# Output the current contents of the file |
|
|
# Output the current contents of the file |
|
|
cat /env-cargo |
|
|
cat /env-cargo |
|
|
|
|
|
|
|
|
|
|
|
@ -106,7 +106,7 @@ WORKDIR /app |
|
|
|
|
|
|
|
|
{% if base == "alpine" %} |
|
|
{% if base == "alpine" %} |
|
|
# Environment variables for Cargo on Alpine based builds |
|
|
# Environment variables for Cargo on Alpine based builds |
|
|
RUN echo "export CARGO_TARGET=${RUST_MUSL_CROSS_TARGET}" >> /env-cargo && \ |
|
|
RUN echo "export CARGO_TARGET=${CARGO_BUILD_TARGET}" >> /env-cargo && \ |
|
|
# Output the current contents of the file |
|
|
# Output the current contents of the file |
|
|
cat /env-cargo |
|
|
cat /env-cargo |
|
|
|
|
|
|
|
|
|
