Browse Source
Merge pull request #1389 from jjlin/alpine
Update Alpine base images to 3.13
pull/1413/head
Daniel García
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
4 additions and
4 deletions
-
docker/Dockerfile.j2
-
docker/amd64/Dockerfile.alpine
-
docker/armv7/Dockerfile.alpine
|
|
@ -5,11 +5,11 @@ |
|
|
|
{% if "alpine" in target_file %} |
|
|
|
{% if "amd64" in target_file %} |
|
|
|
{% set build_stage_base_image = "clux/muslrust:nightly-2021-01-25" %} |
|
|
|
{% set runtime_stage_base_image = "alpine:3.12" %} |
|
|
|
{% set runtime_stage_base_image = "alpine:3.13" %} |
|
|
|
{% set package_arch_target = "x86_64-unknown-linux-musl" %} |
|
|
|
{% elif "armv7" in target_file %} |
|
|
|
{% set build_stage_base_image = "messense/rust-musl-cross:armv7-musleabihf" %} |
|
|
|
{% set runtime_stage_base_image = "balenalib/armv7hf-alpine:3.12" %} |
|
|
|
{% set runtime_stage_base_image = "balenalib/armv7hf-alpine:3.13" %} |
|
|
|
{% set package_arch_target = "armv7-unknown-linux-musleabihf" %} |
|
|
|
{% endif %} |
|
|
|
{% elif "amd64" in target_file %} |
|
|
|
|
|
@ -70,7 +70,7 @@ RUN cargo build --features ${DB} --release --target=x86_64-unknown-linux-musl |
|
|
|
######################## RUNTIME IMAGE ######################## |
|
|
|
# Create a new stage with a minimal image |
|
|
|
# because we already have a binary built |
|
|
|
FROM alpine:3.12 |
|
|
|
FROM alpine:3.13 |
|
|
|
|
|
|
|
ENV ROCKET_ENV "staging" |
|
|
|
ENV ROCKET_PORT=80 |
|
|
|
|
|
@ -71,7 +71,7 @@ RUN musl-strip target/armv7-unknown-linux-musleabihf/release/bitwarden_rs |
|
|
|
######################## RUNTIME IMAGE ######################## |
|
|
|
# Create a new stage with a minimal image |
|
|
|
# because we already have a binary built |
|
|
|
FROM balenalib/armv7hf-alpine:3.12 |
|
|
|
FROM balenalib/armv7hf-alpine:3.13 |
|
|
|
|
|
|
|
ENV ROCKET_ENV "staging" |
|
|
|
ENV ROCKET_PORT=80 |
|
|
|