Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Vaultwarden
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Vaultwarden
Commits
d69be7d0
Unverified
Commit
d69be7d0
authored
4 years ago
by
Daniel García
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #1389 from jjlin/alpine
Update Alpine base images to 3.13
parents
c836f88f
f82de8d0
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docker/Dockerfile.j2
+2
-2
2 additions, 2 deletions
docker/Dockerfile.j2
docker/amd64/Dockerfile.alpine
+1
-1
1 addition, 1 deletion
docker/amd64/Dockerfile.alpine
docker/armv7/Dockerfile.alpine
+1
-1
1 addition, 1 deletion
docker/armv7/Dockerfile.alpine
with
4 additions
and
4 deletions
docker/Dockerfile.j2
+
2
−
2
View file @
d69be7d0
...
@@ -5,11 +5,11 @@
...
@@ -5,11 +5,11 @@
{% if "alpine" in target_file %}
{% if "alpine" in target_file %}
{% if "amd64" in target_file %}
{% if "amd64" in target_file %}
{% set build_stage_base_image = "clux/muslrust:nightly-2021-01-25" %}
{% set build_stage_base_image = "clux/muslrust:nightly-2021-01-25" %}
{% set runtime_stage_base_image = "alpine:3.1
2
" %}
{% set runtime_stage_base_image = "alpine:3.1
3
" %}
{% set package_arch_target = "x86_64-unknown-linux-musl" %}
{% set package_arch_target = "x86_64-unknown-linux-musl" %}
{% elif "armv7" in target_file %}
{% elif "armv7" in target_file %}
{% set build_stage_base_image = "messense/rust-musl-cross:armv7-musleabihf" %}
{% set build_stage_base_image = "messense/rust-musl-cross:armv7-musleabihf" %}
{% set runtime_stage_base_image = "balenalib/armv7hf-alpine:3.1
2
" %}
{% set runtime_stage_base_image = "balenalib/armv7hf-alpine:3.1
3
" %}
{% set package_arch_target = "armv7-unknown-linux-musleabihf" %}
{% set package_arch_target = "armv7-unknown-linux-musleabihf" %}
{% endif %}
{% endif %}
{% elif "amd64" in target_file %}
{% elif "amd64" in target_file %}
...
...
This diff is collapsed.
Click to expand it.
docker/amd64/Dockerfile.alpine
+
1
−
1
View file @
d69be7d0
...
@@ -70,7 +70,7 @@ RUN cargo build --features ${DB} --release --target=x86_64-unknown-linux-musl
...
@@ -70,7 +70,7 @@ RUN cargo build --features ${DB} --release --target=x86_64-unknown-linux-musl
######################## RUNTIME IMAGE ########################
######################## RUNTIME IMAGE ########################
# Create a new stage with a minimal image
# Create a new stage with a minimal image
# because we already have a binary built
# because we already have a binary built
FROM alpine:3.1
2
FROM alpine:3.1
3
ENV ROCKET_ENV "staging"
ENV ROCKET_ENV "staging"
ENV ROCKET_PORT=80
ENV ROCKET_PORT=80
...
...
This diff is collapsed.
Click to expand it.
docker/armv7/Dockerfile.alpine
+
1
−
1
View file @
d69be7d0
...
@@ -71,7 +71,7 @@ RUN musl-strip target/armv7-unknown-linux-musleabihf/release/bitwarden_rs
...
@@ -71,7 +71,7 @@ RUN musl-strip target/armv7-unknown-linux-musleabihf/release/bitwarden_rs
######################## RUNTIME IMAGE ########################
######################## RUNTIME IMAGE ########################
# Create a new stage with a minimal image
# Create a new stage with a minimal image
# because we already have a binary built
# because we already have a binary built
FROM balenalib/armv7hf-alpine:3.1
2
FROM balenalib/armv7hf-alpine:3.1
3
ENV ROCKET_ENV "staging"
ENV ROCKET_ENV "staging"
ENV ROCKET_PORT=80
ENV ROCKET_PORT=80
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment