make docker builds work outside of macos (MystenLabs#2625)

mceisel · Jun 21, 2022 · 15703a0 · 15703a0
1 parent 99543bd
commit 15703a0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/docker/sui-node/Dockerfile b/docker/sui-node/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y cmake clang
 #   3. Update the lockfile in order to reflect the changes to the
 #      root Cargo.toml file.
 FROM chef AS planner
-COPY Cargo.toml Cargo.lock .
+COPY Cargo.toml Cargo.lock ./
 COPY crates/workspace-hack crates/workspace-hack
 RUN sed -i '/crates\/workspace-hack/b; /crates/d' Cargo.toml \
     && cargo metadata -q >/dev/null
@@ -32,7 +32,7 @@ RUN cargo build --release
 # Copy in the rest of the crates (and an unmodified Cargo.toml and Cargo.lock)
 # and build the application. At this point no dependencies should need to be
 # built as they were built and cached by the previous layer.
-COPY Cargo.toml Cargo.lock .
+COPY Cargo.toml Cargo.lock ./
 COPY crates crates
 RUN cargo build --release --bin sui-node
 

diff --git a/docker/sui-node/build.sh b/docker/sui-node/build.sh
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # fast fail.
-set -eo pipefail
+set -e
 
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 REPO_ROOT="$(git rev-parse --show-toplevel)"

diff --git a/docker/sui-tools/Dockerfile b/docker/sui-tools/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y cmake clang
 #   3. Update the lockfile in order to reflect the changes to the
 #      root Cargo.toml file.
 FROM chef AS planner
-COPY Cargo.toml Cargo.lock .
+COPY Cargo.toml Cargo.lock ./
 COPY crates/workspace-hack crates/workspace-hack
 RUN sed -i '/crates\/workspace-hack/b; /crates/d' Cargo.toml \
     && cargo metadata -q >/dev/null
@@ -32,7 +32,7 @@ RUN cargo build --release
 # Copy in the rest of the crates (and an unmodified Cargo.toml and Cargo.lock)
 # and build the application. At this point no dependencies should need to be
 # built as they were built and cached by the previous layer.
-COPY Cargo.toml Cargo.lock .
+COPY Cargo.toml Cargo.lock ./
 COPY crates crates
 RUN cargo build --release \
     --bin sui-node \

diff --git a/docker/sui-tools/build.sh b/docker/sui-tools/build.sh
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # fast fail.
-set -eo pipefail
+set -e
 
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 REPO_ROOT="$(git rev-parse --show-toplevel)"