Skip to content
This repository was archived by the owner on Mar 23, 2023. It is now read-only.

Commit 65cbd58

Browse files
authored
Merge pull request #96 from Cargill/DarianPlumb-fix-dockerfiles
Make contracts dir before cargo new
2 parents 2c56a0d + a634ee4 commit 65cbd58

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

contracts/pike/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ RUN curl -OLsS https://github.com/google/protobuf/releases/download/v3.5.1/proto
5050

5151
COPY ./sdk /sdk
5252

53-
RUN USER=root cargo new --bin contracts/pike
53+
RUN mkdir contracts \
54+
&& USER=root cargo new --bin contracts/pike
5455
WORKDIR /contracts/pike
5556

5657
# Build TP with dummy source in order to cache dependencies in Docker image.

contracts/schema/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ RUN curl -OLsS https://github.com/google/protobuf/releases/download/v3.5.1/proto
5656

5757
COPY ./sdk /sdk
5858

59-
RUN USER=root cargo new --bin contracts/schema
59+
RUN mkdir contracts \
60+
&& USER=root cargo new --bin contracts/schema
6061
WORKDIR /contracts/schema
6162

6263
# Build TP with dummy source in order to cache dependencies in Docker image.

contracts/track_and_trace/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ RUN curl -OLsS https://github.com/google/protobuf/releases/download/v3.5.1/proto
5656

5757
COPY ./sdk /sdk
5858

59-
RUN USER=root cargo new --bin contracts/track_and_trace
59+
RUN mkdir contracts \
60+
&& USER=root cargo new --bin contracts/track_and_trace
6061
WORKDIR /contracts/track_and_trace
6162

6263
# Build TP with dummy source in order to cache dependencies in Docker image.

docker/tests

+5-4
Original file line numberDiff line numberDiff line change
@@ -50,27 +50,28 @@ RUN rustup update \
5050

5151
COPY ./sdk /sdk
5252

53-
RUN USER=root cargo new --bin contracts/schema
53+
RUN mkdir contracts \
54+
&& USER=root cargo new --bin contracts/schema
5455
WORKDIR /contracts/schema
5556

5657
#Build modules with dummy source in order to cache dependencies in Docker image.
5758
COPY ./contracts/schema/Cargo.toml ./Cargo.toml
5859
RUN cargo check
5960

6061
WORKDIR /
61-
RUN USER=root cargo new --bin daemon
62+
RUN USER=root cargo new --bin daemon --vcs none
6263
WORKDIR /daemon
6364
COPY ./daemon/Cargo.toml ./Cargo.toml
6465
RUN cargo check
6566

6667
WORKDIR /
67-
RUN USER=root cargo new --bin cli
68+
RUN USER=root cargo new --bin cli --vcs none
6869
WORKDIR /cli
6970
COPY ./cli/Cargo.toml ./Cargo.toml
7071
RUN cargo check
7172

7273
WORKDIR /
73-
RUN USER=root cargo new --bin contracts/track_and_trace
74+
RUN USER=root cargo new --bin contracts/track_and_trace --vcs none
7475
WORKDIR /contracts/track_and_trace
7576

7677
COPY ./contracts/track_and_trace/Cargo.toml ./Cargo.toml

0 commit comments

Comments
 (0)