topaLE
/
vaultwarden
mirror of https://github.com/dani-garcia/vaultwarden
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Updated rust images and enabled minimal profile

pull/755/head
Daniel García 5 years ago
parent
607521c88f
commit
cf5a985b31
No known key found for this signature in database GPG Key ID: FC8A7D14C3CD543A
12 changed files with 52 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      docker/aarch64/mysql/Dockerfile
  2. 7
      docker/aarch64/sqlite/Dockerfile
  3. 9
      docker/amd64/mysql/Dockerfile
  4. 5
      docker/amd64/mysql/Dockerfile.alpine
  5. 5
      docker/amd64/postgresql/Dockerfile
  6. 5
      docker/amd64/postgresql/Dockerfile.alpine
  7. 9
      docker/amd64/sqlite/Dockerfile
  8. 5
      docker/amd64/sqlite/Dockerfile.alpine
  9. 7
      docker/armv6/mysql/Dockerfile
  10. 7
      docker/armv6/sqlite/Dockerfile
  11. 7
      docker/armv7/mysql/Dockerfile
  12. 7
      docker/armv7/sqlite/Dockerfile

7
docker/aarch64/mysql/Dockerfile
View File

@ -23,11 +23,14 @@ RUN ls
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# We need to use the Rust build image, because # We need to use the Rust build image, because
# we need the Rust compiler and Cargo tooling # we need the Rust compiler and Cargo tooling
FROM rust:1.38 as build FROM rust:1.39 as build
# set mysql backend # set mysql backend
ARG DB=mysql ARG DB=mysql
# Don't download rust docs
RUN rustup set profile minimal
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y \ && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
@ -63,7 +66,7 @@ COPY . .
# Build # Build
RUN rustup target add aarch64-unknown-linux-gnu RUN rustup target add aarch64-unknown-linux-gnu
RUN cargo build --features ${DB} --release --target=aarch64-unknown-linux-gnu -v RUN cargo build --features ${DB} --release --target=aarch64-unknown-linux-gnu
######################## RUNTIME IMAGE ######################## ######################## RUNTIME IMAGE ########################
# Create a new stage with a minimal image # Create a new stage with a minimal image

7
docker/aarch64/sqlite/Dockerfile
View File

@ -23,11 +23,14 @@ RUN ls
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# We need to use the Rust build image, because # We need to use the Rust build image, because
# we need the Rust compiler and Cargo tooling # we need the Rust compiler and Cargo tooling
FROM rust:1.38 as build FROM rust:1.39 as build
# set sqlite as default for DB ARG for backward comaptibility # set sqlite as default for DB ARG for backward comaptibility
ARG DB=sqlite ARG DB=sqlite
# Don't download rust docs
RUN rustup set profile minimal
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y \ && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
@ -62,7 +65,7 @@ COPY . .
# Build # Build
RUN rustup target add aarch64-unknown-linux-gnu RUN rustup target add aarch64-unknown-linux-gnu
RUN cargo build --features ${DB} --release --target=aarch64-unknown-linux-gnu -v RUN cargo build --features ${DB} --release --target=aarch64-unknown-linux-gnu
######################## RUNTIME IMAGE ######################## ######################## RUNTIME IMAGE ########################
# Create a new stage with a minimal image # Create a new stage with a minimal image

9
docker/amd64/mysql/Dockerfile
View File

@ -23,16 +23,13 @@ RUN ls
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# We need to use the Rust build image, because # We need to use the Rust build image, because
# we need the Rust compiler and Cargo tooling # we need the Rust compiler and Cargo tooling
FROM rust:1.38 as build FROM rust:1.39 as build
# set mysql backend # set mysql backend
ARG DB=mysql ARG DB=mysql
# Using bundled SQLite, no need to install it # Don't download rust docs
# RUN apt-get update && apt-get install -y\ RUN rustup set profile minimal
# --no-install-recommends \
# sqlite3\
# && rm -rf /var/lib/apt/lists/*
# Install MySQL package # Install MySQL package
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \

5
docker/amd64/mysql/Dockerfile.alpine
View File

@ -22,11 +22,14 @@ RUN ls
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# Musl build image for statically compiled binary # Musl build image for statically compiled binary
FROM clux/muslrust:nightly-2019-10-19 as build FROM clux/muslrust:nightly-2019-11-23 as build
# set mysql backend # set mysql backend
ARG DB=mysql ARG DB=mysql
# Don't download rust docs
RUN rustup set profile minimal
ENV USER "root" ENV USER "root"
# Install needed libraries # Install needed libraries

5
docker/amd64/postgresql/Dockerfile
View File

@ -23,11 +23,14 @@ RUN ls
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# We need to use the Rust build image, because # We need to use the Rust build image, because
# we need the Rust compiler and Cargo tooling # we need the Rust compiler and Cargo tooling
FROM rust:1.38 as build FROM rust:1.39 as build
# set mysql backend # set mysql backend
ARG DB=postgresql ARG DB=postgresql
# Don't download rust docs
RUN rustup set profile minimal
# Using bundled SQLite, no need to install it # Using bundled SQLite, no need to install it
# RUN apt-get update && apt-get install -y\ # RUN apt-get update && apt-get install -y\
# --no-install-recommends \ # --no-install-recommends \

5
docker/amd64/postgresql/Dockerfile.alpine
View File

@ -22,11 +22,14 @@ RUN ls
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# Musl build image for statically compiled binary # Musl build image for statically compiled binary
FROM clux/muslrust:nightly-2019-10-19 as build FROM clux/muslrust:nightly-2019-11-23 as build
# set mysql backend # set mysql backend
ARG DB=postgresql ARG DB=postgresql
# Don't download rust docs
RUN rustup set profile minimal
ENV USER "root" ENV USER "root"
# Install needed libraries # Install needed libraries

9
docker/amd64/sqlite/Dockerfile
View File

@ -23,16 +23,13 @@ RUN ls
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# We need to use the Rust build image, because # We need to use the Rust build image, because
# we need the Rust compiler and Cargo tooling # we need the Rust compiler and Cargo tooling
FROM rust:1.38 as build FROM rust:1.39 as build
# set sqlite as default for DB ARG for backward comaptibility # set sqlite as default for DB ARG for backward comaptibility
ARG DB=sqlite ARG DB=sqlite
# Using bundled SQLite, no need to install it # Don't download rust docs
# RUN apt-get update && apt-get install -y\ RUN rustup set profile minimal
# --no-install-recommends \
# sqlite3 \
# && rm -rf /var/lib/apt/lists/*
# Creates a dummy project used to grab dependencies # Creates a dummy project used to grab dependencies
RUN USER=root cargo new --bin app RUN USER=root cargo new --bin app

5
docker/amd64/sqlite/Dockerfile.alpine
View File

@ -22,11 +22,14 @@ RUN ls
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# Musl build image for statically compiled binary # Musl build image for statically compiled binary
FROM clux/muslrust:nightly-2019-10-19 as build FROM clux/muslrust:nightly-2019-11-23 as build
# set sqlite as default for DB ARG for backward comaptibility # set sqlite as default for DB ARG for backward comaptibility
ARG DB=sqlite ARG DB=sqlite
# Don't download rust docs
RUN rustup set profile minimal
ENV USER "root" ENV USER "root"
WORKDIR /app WORKDIR /app

7
docker/armv6/mysql/Dockerfile
View File

@ -23,11 +23,14 @@ RUN ls
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# We need to use the Rust build image, because # We need to use the Rust build image, because
# we need the Rust compiler and Cargo tooling # we need the Rust compiler and Cargo tooling
FROM rust:1.38 as build FROM rust:1.39 as build
# set mysql backend # set mysql backend
ARG DB=mysql ARG DB=mysql
# Don't download rust docs
RUN rustup set profile minimal
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y \ && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
@ -63,7 +66,7 @@ COPY . .
# Build # Build
RUN rustup target add arm-unknown-linux-gnueabi RUN rustup target add arm-unknown-linux-gnueabi
RUN cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi -v RUN cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi
######################## RUNTIME IMAGE ######################## ######################## RUNTIME IMAGE ########################
# Create a new stage with a minimal image # Create a new stage with a minimal image

7
docker/armv6/sqlite/Dockerfile
View File

@ -23,11 +23,14 @@ RUN ls
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# We need to use the Rust build image, because # We need to use the Rust build image, because
# we need the Rust compiler and Cargo tooling # we need the Rust compiler and Cargo tooling
FROM rust:1.38 as build FROM rust:1.39 as build
# set sqlite as default for DB ARG for backward comaptibility # set sqlite as default for DB ARG for backward comaptibility
ARG DB=sqlite ARG DB=sqlite
# Don't download rust docs
RUN rustup set profile minimal
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y \ && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
@ -62,7 +65,7 @@ COPY . .
# Build # Build
RUN rustup target add arm-unknown-linux-gnueabi RUN rustup target add arm-unknown-linux-gnueabi
RUN cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi -v RUN cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi
######################## RUNTIME IMAGE ######################## ######################## RUNTIME IMAGE ########################
# Create a new stage with a minimal image # Create a new stage with a minimal image

7
docker/armv7/mysql/Dockerfile
View File

@ -23,11 +23,14 @@ RUN ls
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# We need to use the Rust build image, because # We need to use the Rust build image, because
# we need the Rust compiler and Cargo tooling # we need the Rust compiler and Cargo tooling
FROM rust:1.38 as build FROM rust:1.39 as build
# set mysql backend # set mysql backend
ARG DB=mysql ARG DB=mysql
# Don't download rust docs
RUN rustup set profile minimal
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y \ && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
@ -64,7 +67,7 @@ COPY . .
# Build # Build
RUN rustup target add armv7-unknown-linux-gnueabihf RUN rustup target add armv7-unknown-linux-gnueabihf
RUN cargo build --features ${DB} --release --target=armv7-unknown-linux-gnueabihf -v RUN cargo build --features ${DB} --release --target=armv7-unknown-linux-gnueabihf
######################## RUNTIME IMAGE ######################## ######################## RUNTIME IMAGE ########################
# Create a new stage with a minimal image # Create a new stage with a minimal image

7
docker/armv7/sqlite/Dockerfile
View File

@ -23,11 +23,14 @@ RUN ls
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# We need to use the Rust build image, because # We need to use the Rust build image, because
# we need the Rust compiler and Cargo tooling # we need the Rust compiler and Cargo tooling
FROM rust:1.38 as build FROM rust:1.39 as build
# set sqlite as default for DB ARG for backward comaptibility # set sqlite as default for DB ARG for backward comaptibility
ARG DB=sqlite ARG DB=sqlite
# Don't download rust docs
RUN rustup set profile minimal
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y \ && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
@ -62,7 +65,7 @@ COPY . .
# Build # Build
RUN rustup target add armv7-unknown-linux-gnueabihf RUN rustup target add armv7-unknown-linux-gnueabihf
RUN cargo build --features ${DB} --release --target=armv7-unknown-linux-gnueabihf -v RUN cargo build --features ${DB} --release --target=armv7-unknown-linux-gnueabihf
######################## RUNTIME IMAGE ######################## ######################## RUNTIME IMAGE ########################
# Create a new stage with a minimal image # Create a new stage with a minimal image

Write Preview
Loading…
Cancel
Save