From cf5a985b3114d59b6c7b71e954cedcdd67479497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Sun, 24 Nov 2019 17:52:54 +0100 Subject: [PATCH] Updated rust images and enabled minimal profile --- docker/aarch64/mysql/Dockerfile | 7 +++++-- docker/aarch64/sqlite/Dockerfile | 7 +++++-- docker/amd64/mysql/Dockerfile | 9 +++------ docker/amd64/mysql/Dockerfile.alpine | 5 ++++- docker/amd64/postgresql/Dockerfile | 5 ++++- docker/amd64/postgresql/Dockerfile.alpine | 5 ++++- docker/amd64/sqlite/Dockerfile | 9 +++------ docker/amd64/sqlite/Dockerfile.alpine | 5 ++++- docker/armv6/mysql/Dockerfile | 7 +++++-- docker/armv6/sqlite/Dockerfile | 7 +++++-- docker/armv7/mysql/Dockerfile | 7 +++++-- docker/armv7/sqlite/Dockerfile | 7 +++++-- 12 files changed, 52 insertions(+), 28 deletions(-) diff --git a/docker/aarch64/mysql/Dockerfile b/docker/aarch64/mysql/Dockerfile index 86d3b68..4dcd6b1 100644 --- a/docker/aarch64/mysql/Dockerfile +++ b/docker/aarch64/mysql/Dockerfile @@ -23,11 +23,14 @@ RUN ls ########################## BUILD IMAGE ########################## # We need to use the Rust build image, because # we need the Rust compiler and Cargo tooling -FROM rust:1.38 as build +FROM rust:1.39 as build # set mysql backend ARG DB=mysql +# Don't download rust docs +RUN rustup set profile minimal + RUN apt-get update \ && apt-get install -y \ --no-install-recommends \ @@ -63,7 +66,7 @@ COPY . . # Build 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 ######################## # Create a new stage with a minimal image diff --git a/docker/aarch64/sqlite/Dockerfile b/docker/aarch64/sqlite/Dockerfile index d07b089..7786fbd 100644 --- a/docker/aarch64/sqlite/Dockerfile +++ b/docker/aarch64/sqlite/Dockerfile @@ -23,11 +23,14 @@ RUN ls ########################## BUILD IMAGE ########################## # We need to use the Rust build image, because # 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 ARG DB=sqlite +# Don't download rust docs +RUN rustup set profile minimal + RUN apt-get update \ && apt-get install -y \ --no-install-recommends \ @@ -62,7 +65,7 @@ COPY . . # Build 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 ######################## # Create a new stage with a minimal image diff --git a/docker/amd64/mysql/Dockerfile b/docker/amd64/mysql/Dockerfile index ec0b620..7f2661a 100644 --- a/docker/amd64/mysql/Dockerfile +++ b/docker/amd64/mysql/Dockerfile @@ -23,16 +23,13 @@ RUN ls ########################## BUILD IMAGE ########################## # We need to use the Rust build image, because # we need the Rust compiler and Cargo tooling -FROM rust:1.38 as build +FROM rust:1.39 as build # set mysql backend ARG DB=mysql -# Using bundled SQLite, no need to install it -# RUN apt-get update && apt-get install -y\ -# --no-install-recommends \ -# sqlite3\ -# && rm -rf /var/lib/apt/lists/* +# Don't download rust docs +RUN rustup set profile minimal # Install MySQL package RUN apt-get update && apt-get install -y \ diff --git a/docker/amd64/mysql/Dockerfile.alpine b/docker/amd64/mysql/Dockerfile.alpine index fe44684..4c7f62b 100644 --- a/docker/amd64/mysql/Dockerfile.alpine +++ b/docker/amd64/mysql/Dockerfile.alpine @@ -22,11 +22,14 @@ RUN ls ########################## BUILD IMAGE ########################## # 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 ARG DB=mysql +# Don't download rust docs +RUN rustup set profile minimal + ENV USER "root" # Install needed libraries diff --git a/docker/amd64/postgresql/Dockerfile b/docker/amd64/postgresql/Dockerfile index 7548ddb..4256b90 100644 --- a/docker/amd64/postgresql/Dockerfile +++ b/docker/amd64/postgresql/Dockerfile @@ -23,11 +23,14 @@ RUN ls ########################## BUILD IMAGE ########################## # We need to use the Rust build image, because # we need the Rust compiler and Cargo tooling -FROM rust:1.38 as build +FROM rust:1.39 as build # set mysql backend ARG DB=postgresql +# Don't download rust docs +RUN rustup set profile minimal + # Using bundled SQLite, no need to install it # RUN apt-get update && apt-get install -y\ # --no-install-recommends \ diff --git a/docker/amd64/postgresql/Dockerfile.alpine b/docker/amd64/postgresql/Dockerfile.alpine index 8fa6f2e..975f83c 100644 --- a/docker/amd64/postgresql/Dockerfile.alpine +++ b/docker/amd64/postgresql/Dockerfile.alpine @@ -22,11 +22,14 @@ RUN ls ########################## BUILD IMAGE ########################## # 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 ARG DB=postgresql +# Don't download rust docs +RUN rustup set profile minimal + ENV USER "root" # Install needed libraries diff --git a/docker/amd64/sqlite/Dockerfile b/docker/amd64/sqlite/Dockerfile index 0ce0b3b..f1d669e 100644 --- a/docker/amd64/sqlite/Dockerfile +++ b/docker/amd64/sqlite/Dockerfile @@ -23,16 +23,13 @@ RUN ls ########################## BUILD IMAGE ########################## # We need to use the Rust build image, because # 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 ARG DB=sqlite -# Using bundled SQLite, no need to install it -# RUN apt-get update && apt-get install -y\ -# --no-install-recommends \ -# sqlite3 \ -# && rm -rf /var/lib/apt/lists/* +# Don't download rust docs +RUN rustup set profile minimal # Creates a dummy project used to grab dependencies RUN USER=root cargo new --bin app diff --git a/docker/amd64/sqlite/Dockerfile.alpine b/docker/amd64/sqlite/Dockerfile.alpine index 69a0b0e..9941b04 100644 --- a/docker/amd64/sqlite/Dockerfile.alpine +++ b/docker/amd64/sqlite/Dockerfile.alpine @@ -22,11 +22,14 @@ RUN ls ########################## BUILD IMAGE ########################## # 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 ARG DB=sqlite +# Don't download rust docs +RUN rustup set profile minimal + ENV USER "root" WORKDIR /app diff --git a/docker/armv6/mysql/Dockerfile b/docker/armv6/mysql/Dockerfile index 32feb63..34675a3 100644 --- a/docker/armv6/mysql/Dockerfile +++ b/docker/armv6/mysql/Dockerfile @@ -23,11 +23,14 @@ RUN ls ########################## BUILD IMAGE ########################## # We need to use the Rust build image, because # we need the Rust compiler and Cargo tooling -FROM rust:1.38 as build +FROM rust:1.39 as build # set mysql backend ARG DB=mysql +# Don't download rust docs +RUN rustup set profile minimal + RUN apt-get update \ && apt-get install -y \ --no-install-recommends \ @@ -63,7 +66,7 @@ COPY . . # Build 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 ######################## # Create a new stage with a minimal image diff --git a/docker/armv6/sqlite/Dockerfile b/docker/armv6/sqlite/Dockerfile index 009b134..1598949 100644 --- a/docker/armv6/sqlite/Dockerfile +++ b/docker/armv6/sqlite/Dockerfile @@ -23,11 +23,14 @@ RUN ls ########################## BUILD IMAGE ########################## # We need to use the Rust build image, because # 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 ARG DB=sqlite +# Don't download rust docs +RUN rustup set profile minimal + RUN apt-get update \ && apt-get install -y \ --no-install-recommends \ @@ -62,7 +65,7 @@ COPY . . # Build 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 ######################## # Create a new stage with a minimal image diff --git a/docker/armv7/mysql/Dockerfile b/docker/armv7/mysql/Dockerfile index 54c7f61..d3859db 100644 --- a/docker/armv7/mysql/Dockerfile +++ b/docker/armv7/mysql/Dockerfile @@ -23,11 +23,14 @@ RUN ls ########################## BUILD IMAGE ########################## # We need to use the Rust build image, because # we need the Rust compiler and Cargo tooling -FROM rust:1.38 as build +FROM rust:1.39 as build # set mysql backend ARG DB=mysql +# Don't download rust docs +RUN rustup set profile minimal + RUN apt-get update \ && apt-get install -y \ --no-install-recommends \ @@ -64,7 +67,7 @@ COPY . . # Build 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 ######################## # Create a new stage with a minimal image diff --git a/docker/armv7/sqlite/Dockerfile b/docker/armv7/sqlite/Dockerfile index 81b3e47..707c576 100644 --- a/docker/armv7/sqlite/Dockerfile +++ b/docker/armv7/sqlite/Dockerfile @@ -23,11 +23,14 @@ RUN ls ########################## BUILD IMAGE ########################## # We need to use the Rust build image, because # 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 ARG DB=sqlite +# Don't download rust docs +RUN rustup set profile minimal + RUN apt-get update \ && apt-get install -y \ --no-install-recommends \ @@ -62,7 +65,7 @@ COPY . . # Build 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 ######################## # Create a new stage with a minimal image