commit 1a5c1979e3a00515e4b23c0757e6d3379f268146
parent cec9566d2a0a47e4a4ae9b654155909c6256db09
Author: Miroslav Prasil <miroslav@prasil.info>
Date: Thu, 30 Aug 2018 10:38:38 +0100
Move Alpine Dockerfile to separate file
Diffstat:
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/Dockerfile b/Dockerfile
@@ -25,11 +25,19 @@ RUN npm run dist \
&& mv build /web-vault
########################## BUILD IMAGE ##########################
-# Musl build image for statically compiled binary
-FROM clux/muslrust:nightly-2018-08-24 as build
+# We need to use the Rust build image, because
+# we need the Rust compiler and Cargo tooling
+FROM rust as build
+
+# Using bundled SQLite, no need to install it
+# RUN apt-get update && apt-get install -y\
+# sqlite3\
+# --no-install-recommends\
+# && rm -rf /var/lib/apt/lists/*
# Creates a dummy project used to grab dependencies
-RUN USER=root cargo init --bin
+RUN USER=root cargo new --bin app
+WORKDIR /app
# Copies over *only* your manifests and vendored dependencies
COPY ./Cargo.* ./
@@ -53,17 +61,17 @@ RUN cargo build --release
######################## RUNTIME IMAGE ########################
# Create a new stage with a minimal image
# because we already have a binary built
-FROM alpine:3.8
+FROM debian:stretch-slim
ENV ROCKET_ENV "staging"
ENV ROCKET_WORKERS=10
-ENV SSL_CERT_DIR=/etc/ssl/certs
# Install needed libraries
-RUN apk add \
- openssl\
- ca-certificates \
- && rm /var/cache/apk/*
+RUN apt-get update && apt-get install -y\
+ openssl\
+ ca-certificates\
+ --no-install-recommends\
+ && rm -rf /var/lib/apt/lists/*
RUN mkdir /data
VOLUME /data
@@ -74,7 +82,7 @@ EXPOSE 80
COPY .env .
COPY Rocket.toml .
COPY --from=vault /web-vault ./web-vault
-COPY --from=build /volume/target/x86_64-unknown-linux-musl/release/bitwarden_rs .
+COPY --from=build app/target/release/bitwarden_rs .
# Configures the startup!
CMD ./bitwarden_rs
diff --git a/Dockerfile b/Dockerfile.alpine