mirror of
				https://github.com/dani-garcia/vaultwarden.git
				synced 2025-10-27 16:30:02 +02:00 
			
		
		
		
	last round of linting fixes
Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
		| @@ -2,32 +2,35 @@ | ||||
| # 	https://docs.docker.com/develop/develop-images/multistage-build/ | ||||
| # 	https://whitfin.io/speeding-up-rust-docker-builds/ | ||||
| ####################### VAULT BUILD IMAGE  ####################### | ||||
| FROM alpine as vault | ||||
| FROM alpine:3.10 as vault | ||||
|  | ||||
| ENV VAULT_VERSION "v2.10.1" | ||||
|  | ||||
| ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" | ||||
|  | ||||
| RUN apk add --update-cache --upgrade \ | ||||
| RUN apk add --no-cache --upgrade \ | ||||
|     curl \ | ||||
|     tar | ||||
|  | ||||
| RUN mkdir /web-vault | ||||
| WORKDIR /web-vault | ||||
|  | ||||
| SHELL ["/bin/ash", "-eo", "pipefail", "-c"] | ||||
|  | ||||
| RUN curl -L $URL | tar xz | ||||
| RUN ls | ||||
|  | ||||
| ########################## BUILD IMAGE  ########################## | ||||
| # We need to use the Rust build image, because | ||||
| # we need the Rust compiler and Cargo tooling | ||||
| FROM rust as build | ||||
| FROM rust:1.36 as build | ||||
|  | ||||
| # set mysql backend | ||||
| ARG DB=mysql | ||||
|  | ||||
| RUN apt-get update \ | ||||
|     && apt-get install -y \ | ||||
|         --no-install-recommends \ | ||||
|         gcc-arm-linux-gnueabi \ | ||||
|     && mkdir -p ~/.cargo \ | ||||
|     && echo '[target.arm-unknown-linux-gnueabi]' >> ~/.cargo/config \ | ||||
| @@ -44,6 +47,7 @@ RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \ | ||||
|     && dpkg --add-architecture armel \ | ||||
|     && apt-get update \ | ||||
|     && apt-get install -y \ | ||||
|         --no-install-recommends \ | ||||
|         libssl-dev:armel \ | ||||
|         libc6-dev:armel \ | ||||
|         libmariadb-dev:armel | ||||
| @@ -73,12 +77,12 @@ ENV ROCKET_WORKERS=10 | ||||
| RUN [ "cross-build-start" ] | ||||
|  | ||||
| # Install needed libraries | ||||
| RUN apt-get update && apt-get install -y\ | ||||
|     openssl\ | ||||
|     ca-certificates\ | ||||
|     libmariadbclient-dev\ | ||||
|     --no-install-recommends\ | ||||
|  && rm -rf /var/lib/apt/lists/* | ||||
| RUN apt-get update && apt-get install -y \ | ||||
|     --no-install-recommends \ | ||||
|     openssl \ | ||||
|     ca-certificates \ | ||||
|     libmariadbclient-dev \ | ||||
|     && rm -rf /var/lib/apt/lists/* | ||||
|  | ||||
| RUN mkdir /data | ||||
|  | ||||
| @@ -94,4 +98,4 @@ COPY --from=vault /web-vault ./web-vault | ||||
| COPY --from=build /app/target/arm-unknown-linux-gnueabi/release/bitwarden_rs . | ||||
|  | ||||
| # Configures the startup! | ||||
| CMD ./bitwarden_rs | ||||
| CMD ["./bitwarden_rs"] | ||||
|   | ||||
		Reference in New Issue
	
	Block a user