From 7a0bb18dcfc3855baa5c4019f159cbfc42f4e8aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Tue, 31 Dec 2019 15:31:01 +0100 Subject: [PATCH] Make `cargo new` independent of workdir to be exact The muslrust images seem to have a workdir of /volume as opposed to / in the others so doing cargo new like this would create the folder in /volume/app. --- docker/Dockerfile.j2 | 2 +- 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 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index 42611420..c273b4ed 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -156,7 +156,7 @@ RUN apt-get update && apt-get install -y \ {% endif %} # Creates a dummy project used to grab dependencies -RUN USER=root cargo new --bin app +RUN USER=root cargo new --bin /app WORKDIR /app # Copies over *only* your manifests and build files diff --git a/docker/aarch64/mysql/Dockerfile b/docker/aarch64/mysql/Dockerfile index e7ec2402..e15c25b5 100644 --- a/docker/aarch64/mysql/Dockerfile +++ b/docker/aarch64/mysql/Dockerfile @@ -65,7 +65,7 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies -RUN USER=root cargo new --bin app +RUN USER=root cargo new --bin /app WORKDIR /app # Copies over *only* your manifests and build files diff --git a/docker/aarch64/sqlite/Dockerfile b/docker/aarch64/sqlite/Dockerfile index 0945e573..1cebf6b3 100644 --- a/docker/aarch64/sqlite/Dockerfile +++ b/docker/aarch64/sqlite/Dockerfile @@ -59,7 +59,7 @@ ENV CARGO_HOME "/root/.cargo" ENV USER "root" # Creates a dummy project used to grab dependencies -RUN USER=root cargo new --bin app +RUN USER=root cargo new --bin /app WORKDIR /app # Copies over *only* your manifests and build files diff --git a/docker/amd64/mysql/Dockerfile b/docker/amd64/mysql/Dockerfile index d59c8953..53da03a5 100644 --- a/docker/amd64/mysql/Dockerfile +++ b/docker/amd64/mysql/Dockerfile @@ -44,7 +44,7 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies -RUN USER=root cargo new --bin app +RUN USER=root cargo new --bin /app WORKDIR /app # Copies over *only* your manifests and build files diff --git a/docker/amd64/mysql/Dockerfile.alpine b/docker/amd64/mysql/Dockerfile.alpine index 295ef3c6..62ad91d7 100644 --- a/docker/amd64/mysql/Dockerfile.alpine +++ b/docker/amd64/mysql/Dockerfile.alpine @@ -39,7 +39,7 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies -RUN USER=root cargo new --bin app +RUN USER=root cargo new --bin /app WORKDIR /app # Copies over *only* your manifests and build files diff --git a/docker/amd64/postgresql/Dockerfile b/docker/amd64/postgresql/Dockerfile index bf1aa2f7..decc2c28 100644 --- a/docker/amd64/postgresql/Dockerfile +++ b/docker/amd64/postgresql/Dockerfile @@ -44,7 +44,7 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies -RUN USER=root cargo new --bin app +RUN USER=root cargo new --bin /app WORKDIR /app # Copies over *only* your manifests and build files diff --git a/docker/amd64/postgresql/Dockerfile.alpine b/docker/amd64/postgresql/Dockerfile.alpine index 7177698f..a2429058 100644 --- a/docker/amd64/postgresql/Dockerfile.alpine +++ b/docker/amd64/postgresql/Dockerfile.alpine @@ -39,7 +39,7 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies -RUN USER=root cargo new --bin app +RUN USER=root cargo new --bin /app WORKDIR /app # Copies over *only* your manifests and build files diff --git a/docker/amd64/sqlite/Dockerfile b/docker/amd64/sqlite/Dockerfile index 56cf4bee..d874f107 100644 --- a/docker/amd64/sqlite/Dockerfile +++ b/docker/amd64/sqlite/Dockerfile @@ -38,7 +38,7 @@ ARG DB=sqlite RUN rustup set profile minimal # Creates a dummy project used to grab dependencies -RUN USER=root cargo new --bin app +RUN USER=root cargo new --bin /app WORKDIR /app # Copies over *only* your manifests and build files diff --git a/docker/amd64/sqlite/Dockerfile.alpine b/docker/amd64/sqlite/Dockerfile.alpine index 3a1ca323..831eae52 100644 --- a/docker/amd64/sqlite/Dockerfile.alpine +++ b/docker/amd64/sqlite/Dockerfile.alpine @@ -33,7 +33,7 @@ RUN rustup set profile minimal ENV USER "root" # Creates a dummy project used to grab dependencies -RUN USER=root cargo new --bin app +RUN USER=root cargo new --bin /app WORKDIR /app # Copies over *only* your manifests and build files diff --git a/docker/armv6/mysql/Dockerfile b/docker/armv6/mysql/Dockerfile index ceb2ba64..c6920e36 100644 --- a/docker/armv6/mysql/Dockerfile +++ b/docker/armv6/mysql/Dockerfile @@ -65,7 +65,7 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies -RUN USER=root cargo new --bin app +RUN USER=root cargo new --bin /app WORKDIR /app # Copies over *only* your manifests and build files diff --git a/docker/armv6/sqlite/Dockerfile b/docker/armv6/sqlite/Dockerfile index 638cd983..47b81a5c 100644 --- a/docker/armv6/sqlite/Dockerfile +++ b/docker/armv6/sqlite/Dockerfile @@ -59,7 +59,7 @@ ENV CARGO_HOME "/root/.cargo" ENV USER "root" # Creates a dummy project used to grab dependencies -RUN USER=root cargo new --bin app +RUN USER=root cargo new --bin /app WORKDIR /app # Copies over *only* your manifests and build files diff --git a/docker/armv7/mysql/Dockerfile b/docker/armv7/mysql/Dockerfile index 74265b45..9efa0c45 100644 --- a/docker/armv7/mysql/Dockerfile +++ b/docker/armv7/mysql/Dockerfile @@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies -RUN USER=root cargo new --bin app +RUN USER=root cargo new --bin /app WORKDIR /app # Copies over *only* your manifests and build files diff --git a/docker/armv7/sqlite/Dockerfile b/docker/armv7/sqlite/Dockerfile index 32bcb0b2..317dbf1b 100644 --- a/docker/armv7/sqlite/Dockerfile +++ b/docker/armv7/sqlite/Dockerfile @@ -48,7 +48,7 @@ RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \ libc6-dev:armhf # Creates a dummy project used to grab dependencies -RUN USER=root cargo new --bin app +RUN USER=root cargo new --bin /app WORKDIR /app # Copies over *only* your manifests and build files