From 016680f5fb20227160a5073731848830fcdfe354 Mon Sep 17 00:00:00 2001
From: Zahary Karadjov <zahary@gmail.com>
Date: Thu, 20 Jun 2019 17:06:35 +0300
Subject: [PATCH] Try to debug a missing .nimble-link for the news package in
 the docker builds

---
 docker/beacon_node/Dockerfile | 7 ++++---
 docker/beacon_node/Makefile   | 8 ++++----
 docker/build_beacon_node.sh   | 2 +-
 vendor/nim-beacon-chain       | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/docker/beacon_node/Dockerfile b/docker/beacon_node/Dockerfile
index d9ff47416..124f0deb7 100644
--- a/docker/beacon_node/Dockerfile
+++ b/docker/beacon_node/Dockerfile
@@ -20,10 +20,11 @@ RUN export GOROOT=/usr/local/go \
  && cd nimbus \
  && git reset --hard ${GIT_REVISION} \
  && make update deps vendor/go/bin/p2pd nat-libs \
- && cp vendor/go/bin/p2pd /usr/bin/p2pd
+ && cp vendor/go/bin/p2pd /usr/bin/p2pd \
+ && ls vendor/.nimble/pkgs
 
 ARG NETWORK
-ARG NETWORK_BACKEND
+ARG NETWORK_TYPE
 
 RUN cd nimbus \
  && set -a \
@@ -33,7 +34,7 @@ RUN cd nimbus \
       -d:release \
       --debugger:native \
       --debugInfo \
-      -d:"network_type=${NETWORK_BACKEND}" \
+      -d:"network_type=${NETWORK_TYPE}" \
       -d:SHARD_COUNT=${SHARD_COUNT} \
       -d:SLOTS_PER_EPOCH=${SLOTS_PER_EPOCH} \
       -d:SECONDS_PER_SLOT=${SECONDS_PER_SLOT} \
diff --git a/docker/beacon_node/Makefile b/docker/beacon_node/Makefile
index fb0d4a009..62193f2e4 100644
--- a/docker/beacon_node/Makefile
+++ b/docker/beacon_node/Makefile
@@ -2,17 +2,17 @@
 
 GIT_REVISION    ?= $(git rev-parse HEAD)
 
-NETWORK         ?= testnet0
-NETWORK_BACKEND ?= rlpx
+NETWORK         ?= testnet1
+NETWORK_TYPE    ?= libp2p_spec
 
-IMAGE_TAG       ?= $(NETWORK)-$(NETWORK_BACKEND)
+IMAGE_TAG       ?= $(NETWORK)
 IMAGE_NAME      ?= statusteam/nimbus_beacon_node:$(IMAGE_TAG)
 
 build: $(NIX_INSTALL)
 	docker build \
 		--build-arg="GIT_REVISION=$(GIT_REVISION)" \
 		--build-arg="NETWORK=$(NETWORK)" \
-		--build-arg="NETWORK_BACKEND=$(NETWORK_BACKEND)" \
+		--build-arg="NETWORK_TYPE=$(NETWORK_TYPE)" \
 		-t $(IMAGE_NAME) .
 
 push: build
diff --git a/docker/build_beacon_node.sh b/docker/build_beacon_node.sh
index d37542192..fd2186e8d 100755
--- a/docker/build_beacon_node.sh
+++ b/docker/build_beacon_node.sh
@@ -14,7 +14,7 @@ fi
 
 buildAndPush() {
   export NETWORK=$1
-  export NETWORK_BACKEND=$2
+  export NETWORK_TYPE=$2
 
   (cd beacon_node && make push)
 }
diff --git a/vendor/nim-beacon-chain b/vendor/nim-beacon-chain
index beca856be..681fc2dd3 160000
--- a/vendor/nim-beacon-chain
+++ b/vendor/nim-beacon-chain
@@ -1 +1 @@
-Subproject commit beca856bedaa8513e22f68973ed12f58dff68fdd
+Subproject commit 681fc2dd36ff865c6dae50ed5b69587bc235e2a4