mirror of
				https://github.com/dani-garcia/vaultwarden.git
				synced 2025-11-04 04:08:20 +02:00 
			
		
		
		
	Update images to Bookworm and PQ15
This PR updates the base images to use Debian Bookworm as base image. Also the MUSL/Alpine builds now use OpenSSLv3 and PostgreSQL v15. The GHA Workflows are updated to use Ubuntu 22.04 to better match the versions of Debian Bookworm. Also: - Enabled spares crate registry - Updated workflow actions - Updated Rust to v1.71.0 - The rust-musl images now use musl v1.2.3 for the 32bit arch's if the Rust version is v1.71.0 or higher. The 64bit arch's already used musl v1.2.3. - Updated crates. Improves / Closes #3434
This commit is contained in:
		@@ -26,7 +26,7 @@
 | 
			
		||||
FROM docker.io/vaultwarden/web-vault@sha256:e5b5e99d132d50dc73176afb65f41cf3b834fb06bfa1d621ac16c705c3f10085 as vault
 | 
			
		||||
 | 
			
		||||
########################## BUILD IMAGE  ##########################
 | 
			
		||||
FROM docker.io/blackdex/rust-musl:armv7-musleabihf-stable-1.70.0 as build
 | 
			
		||||
FROM docker.io/blackdex/rust-musl:armv7-musleabihf-stable-1.71.0-openssl3 as build
 | 
			
		||||
 | 
			
		||||
# Build time options to avoid dpkg warnings and help with reproducible builds.
 | 
			
		||||
ENV DEBIAN_FRONTEND=noninteractive \
 | 
			
		||||
@@ -34,12 +34,16 @@ ENV DEBIAN_FRONTEND=noninteractive \
 | 
			
		||||
    TZ=UTC \
 | 
			
		||||
    TERM=xterm-256color \
 | 
			
		||||
    CARGO_HOME="/root/.cargo" \
 | 
			
		||||
    REGISTRIES_CRATES_IO_PROTOCOL=sparse \
 | 
			
		||||
    USER="root"
 | 
			
		||||
 | 
			
		||||
# Create CARGO_HOME folder and don't download rust docs
 | 
			
		||||
RUN mkdir -pv "${CARGO_HOME}" \
 | 
			
		||||
    && rustup set profile minimal
 | 
			
		||||
 | 
			
		||||
# Use PostgreSQL v15 during Alpine/MUSL builds instead of the default v11
 | 
			
		||||
# Debian Bookworm already contains libpq v15
 | 
			
		||||
ENV PQ_LIB_DIR="/usr/local/musl/pq15/lib"
 | 
			
		||||
 | 
			
		||||
# Creates a dummy project used to grab dependencies
 | 
			
		||||
RUN USER=root cargo new --bin /app
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user