From 97d41c2686b9bdf4429d614c2f8c7ba4d7fbb546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Sat, 26 Oct 2019 00:55:58 +0200 Subject: [PATCH] Revert rustup minimal profile, rustup can't be updated --- docker/aarch64/mysql/Dockerfile | 2 -- docker/aarch64/sqlite/Dockerfile | 2 -- docker/amd64/mysql/Dockerfile | 2 -- docker/amd64/mysql/Dockerfile.alpine | 2 -- docker/amd64/postgresql/Dockerfile | 2 -- docker/amd64/postgresql/Dockerfile.alpine | 2 -- docker/amd64/sqlite/Dockerfile | 2 -- docker/amd64/sqlite/Dockerfile.alpine | 2 -- docker/armv6/mysql/Dockerfile | 2 -- docker/armv6/sqlite/Dockerfile | 2 -- docker/armv7/mysql/Dockerfile | 2 -- docker/armv7/sqlite/Dockerfile | 2 -- 12 files changed, 24 deletions(-) diff --git a/docker/aarch64/mysql/Dockerfile b/docker/aarch64/mysql/Dockerfile index 8449b97..d719a96 100644 --- a/docker/aarch64/mysql/Dockerfile +++ b/docker/aarch64/mysql/Dockerfile @@ -62,8 +62,6 @@ ENV OPENSSL_LIB_DIR="/usr/lib/aarch64-linux-gnu" COPY . . # Build -RUN rustup self update -RUN rustup set profile minimal RUN rustup target add aarch64-unknown-linux-gnu RUN cargo build --features ${DB} --release --target=aarch64-unknown-linux-gnu -v diff --git a/docker/aarch64/sqlite/Dockerfile b/docker/aarch64/sqlite/Dockerfile index 8a56b3d..f1df35a 100644 --- a/docker/aarch64/sqlite/Dockerfile +++ b/docker/aarch64/sqlite/Dockerfile @@ -62,8 +62,6 @@ ENV OPENSSL_LIB_DIR="/usr/lib/aarch64-linux-gnu" COPY . . # Build -RUN rustup self update -RUN rustup set profile minimal RUN rustup target add aarch64-unknown-linux-gnu RUN cargo build --features ${DB} --release --target=aarch64-unknown-linux-gnu -v diff --git a/docker/amd64/mysql/Dockerfile b/docker/amd64/mysql/Dockerfile index c802e1c..cae8de2 100644 --- a/docker/amd64/mysql/Dockerfile +++ b/docker/amd64/mysql/Dockerfile @@ -41,8 +41,6 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies -RUN rustup self update -RUN rustup set profile minimal RUN USER=root cargo new --bin app WORKDIR /app diff --git a/docker/amd64/mysql/Dockerfile.alpine b/docker/amd64/mysql/Dockerfile.alpine index acab7e2..ad7df06 100644 --- a/docker/amd64/mysql/Dockerfile.alpine +++ b/docker/amd64/mysql/Dockerfile.alpine @@ -41,8 +41,6 @@ WORKDIR /app # To avoid copying unneeded files, use .dockerignore COPY . . -RUN rustup self update -RUN rustup set profile minimal RUN rustup target add x86_64-unknown-linux-musl # Make sure that we actually build the project diff --git a/docker/amd64/postgresql/Dockerfile b/docker/amd64/postgresql/Dockerfile index a2db804..1ccbba7 100644 --- a/docker/amd64/postgresql/Dockerfile +++ b/docker/amd64/postgresql/Dockerfile @@ -41,8 +41,6 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies -RUN rustup self update -RUN rustup set profile minimal RUN USER=root cargo new --bin app WORKDIR /app diff --git a/docker/amd64/postgresql/Dockerfile.alpine b/docker/amd64/postgresql/Dockerfile.alpine index 38e2fcf..16938ee 100644 --- a/docker/amd64/postgresql/Dockerfile.alpine +++ b/docker/amd64/postgresql/Dockerfile.alpine @@ -41,8 +41,6 @@ WORKDIR /app # To avoid copying unneeded files, use .dockerignore COPY . . -RUN rustup self update -RUN rustup set profile minimal RUN rustup target add x86_64-unknown-linux-musl # Make sure that we actually build the project diff --git a/docker/amd64/sqlite/Dockerfile b/docker/amd64/sqlite/Dockerfile index 1bebc4e..b1f0831 100644 --- a/docker/amd64/sqlite/Dockerfile +++ b/docker/amd64/sqlite/Dockerfile @@ -41,8 +41,6 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies -RUN rustup self update -RUN rustup set profile minimal RUN USER=root cargo new --bin app WORKDIR /app diff --git a/docker/amd64/sqlite/Dockerfile.alpine b/docker/amd64/sqlite/Dockerfile.alpine index e343b3c..66325cf 100644 --- a/docker/amd64/sqlite/Dockerfile.alpine +++ b/docker/amd64/sqlite/Dockerfile.alpine @@ -41,8 +41,6 @@ WORKDIR /app # To avoid copying unneeded files, use .dockerignore COPY . . -RUN rustup self update -RUN rustup set profile minimal RUN rustup target add x86_64-unknown-linux-musl # Make sure that we actually build the project diff --git a/docker/armv6/mysql/Dockerfile b/docker/armv6/mysql/Dockerfile index 33773ed..2230d1a 100644 --- a/docker/armv6/mysql/Dockerfile +++ b/docker/armv6/mysql/Dockerfile @@ -62,8 +62,6 @@ ENV OPENSSL_LIB_DIR="/usr/lib/arm-linux-gnueabi" COPY . . # Build -RUN rustup self update -RUN rustup set profile minimal RUN rustup target add arm-unknown-linux-gnueabi RUN cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi -v diff --git a/docker/armv6/sqlite/Dockerfile b/docker/armv6/sqlite/Dockerfile index 6c19db7..fa3f2cc 100644 --- a/docker/armv6/sqlite/Dockerfile +++ b/docker/armv6/sqlite/Dockerfile @@ -62,8 +62,6 @@ ENV OPENSSL_LIB_DIR="/usr/lib/arm-linux-gnueabi" COPY . . # Build -RUN rustup self update -RUN rustup set profile minimal RUN rustup target add arm-unknown-linux-gnueabi RUN cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi -v diff --git a/docker/armv7/mysql/Dockerfile b/docker/armv7/mysql/Dockerfile index 3b41696..0a0e3ea 100644 --- a/docker/armv7/mysql/Dockerfile +++ b/docker/armv7/mysql/Dockerfile @@ -63,8 +63,6 @@ ENV OPENSSL_LIB_DIR="/usr/lib/arm-linux-gnueabihf" COPY . . # Build -RUN rustup self update -RUN rustup set profile minimal RUN rustup target add armv7-unknown-linux-gnueabihf RUN cargo build --features ${DB} --release --target=armv7-unknown-linux-gnueabihf -v diff --git a/docker/armv7/sqlite/Dockerfile b/docker/armv7/sqlite/Dockerfile index 25f31de..7111c0d 100644 --- a/docker/armv7/sqlite/Dockerfile +++ b/docker/armv7/sqlite/Dockerfile @@ -62,8 +62,6 @@ ENV OPENSSL_LIB_DIR="/usr/lib/arm-linux-gnueabihf" COPY . . # Build -RUN rustup self update -RUN rustup set profile minimal RUN rustup target add armv7-unknown-linux-gnueabihf RUN cargo build --features ${DB} --release --target=armv7-unknown-linux-gnueabihf -v