Bläddra i källkod

Updated rust images and enabled minimal profile

Daniel García 6 år sedan
förälder
incheckning
cf5a985b31

+ 5 - 2
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

+ 5 - 2
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

+ 3 - 6
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 \

+ 4 - 1
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

+ 4 - 1
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 \

+ 4 - 1
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

+ 3 - 6
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

+ 4 - 1
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

+ 5 - 2
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

+ 5 - 2
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

+ 5 - 2
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

+ 5 - 2
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