Merge pull request #186 from subspace/fix-docker-build

Fix building container images

.dockerignore

@@ -4,6 +4,8 @@
 !/.git/config
 !/.git/HEAD
 !/crates
+!/cumulus
+!/polkadot
 !/substrate
 !/Cargo.lock
 !/Cargo.toml

Dockerfile-farmer

@@ -17,11 +17,17 @@ RUN /root/.cargo/bin/rustup target add wasm32-unknown-unknown
 COPY Cargo.lock /code/Cargo.lock
 COPY Cargo.toml /code/Cargo.toml
 
-# Up until this line all Rust images in this repo should be the same to share the same layers
-
+# Just enough files for `git rev-parse --short HEAD` to work (used in Substrate node build)
+COPY .git /code/.git
+# Just an empty directory for Git to recognize it is indeed a Git repository
+RUN mkdir /code/.git/objects
 COPY crates /code/crates
+COPY cumulus /code/cumulus
+COPY polkadot /code/polkadot
 COPY substrate /code/substrate
 
+# Up until this line all Rust images in this repo should be the same to share the same layers
+
 RUN \
     /root/.cargo/bin/cargo build --release --bin subspace-farmer && \
     mv target/release/subspace-farmer subspace-farmer && \

Dockerfile-node

@@ -17,15 +17,17 @@ RUN /root/.cargo/bin/rustup target add wasm32-unknown-unknown
 COPY Cargo.lock /code/Cargo.lock
 COPY Cargo.toml /code/Cargo.toml
 
-# Up until this line all Rust images in this repo should be the same to share the same layers
-
 # Just enough files for `git rev-parse --short HEAD` to work (used in Substrate node build)
 COPY .git /code/.git
 # Just an empty directory for Git to recognize it is indeed a Git repository
 RUN mkdir /code/.git/objects
 COPY crates /code/crates
+COPY cumulus /code/cumulus
+COPY polkadot /code/polkadot
 COPY substrate /code/substrate
 
+# Up until this line all Rust images in this repo should be the same to share the same layers
+
 RUN \
     /root/.cargo/bin/cargo build --release --bin subspace-node && \
     mv target/release/subspace-node subspace-node && \