mirror of
https://github.com/dani-garcia/vaultwarden.git
synced 2025-05-11 06:03:57 +00:00
Revert setcap, update rust and crates
- Revert #3170 as discussed in #3387 In hindsight it's better to not have this feature - Update Dockerfile.j2 for easy version changes. Just change it in one place instead of multiple - Updated to Rust to latest patched version - Updated crates to latest available - Pinned mimalloc to an older version, as it breaks on musl builds
This commit is contained in:
parent
525e6bb65a
commit
fc43608eec
21 changed files with 149 additions and 261 deletions
|
@ -2,7 +2,6 @@
|
|||
|
||||
# This file was generated using a Jinja2 template.
|
||||
# Please make your changes in `Dockerfile.j2` and then `make` the individual Dockerfiles.
|
||||
|
||||
# Using multistage build:
|
||||
# https://docs.docker.com/develop/develop-images/multistage-build/
|
||||
# https://whitfin.io/speeding-up-rust-docker-builds/
|
||||
|
@ -27,7 +26,7 @@
|
|||
FROM vaultwarden/web-vault@sha256:aa6ba791911a815ea570ec2ddc59992481c6ba8fbb65eed4f7074b463430d3ee as vault
|
||||
|
||||
########################## BUILD IMAGE ##########################
|
||||
FROM rust:1.68.1-bullseye as build
|
||||
FROM rust:1.68.2-bullseye as build
|
||||
|
||||
# Build time options to avoid dpkg warnings and help with reproducible builds.
|
||||
ENV DEBIAN_FRONTEND=noninteractive \
|
||||
|
@ -45,7 +44,6 @@ RUN mkdir -pv "${CARGO_HOME}" \
|
|||
RUN apt-get update \
|
||||
&& apt-get install -y \
|
||||
--no-install-recommends \
|
||||
libcap2-bin \
|
||||
libmariadb-dev \
|
||||
libpq-dev
|
||||
|
||||
|
@ -79,7 +77,6 @@ RUN touch src/main.rs
|
|||
# your actual source files being built
|
||||
RUN cargo build --features ${DB} --release
|
||||
|
||||
|
||||
######################## RUNTIME IMAGE ########################
|
||||
# Create a new stage with a minimal image
|
||||
# because we already have a binary built
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue