From 8241320171dee269991a9e5298e2bee5b85d2bd0 Mon Sep 17 00:00:00 2001
From: Zahary Karadjov <zahary@gmail.com>
Date: Wed, 19 Jun 2019 21:28:54 +0300
Subject: [PATCH] Install Go in the beacon_node docker image before compiling
 the LibP2P deamon

---
 docker/beacon_node/Dockerfile | 13 +++++++++++--
 vendor/nim-beacon-chain       |  2 +-
 vendor/nim-eth                |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/docker/beacon_node/Dockerfile b/docker/beacon_node/Dockerfile
index b494534e7..e222eb3c4 100644
--- a/docker/beacon_node/Dockerfile
+++ b/docker/beacon_node/Dockerfile
@@ -1,13 +1,22 @@
 FROM statusteam/nim-base AS build
 
 RUN apt update \
- && apt install -y build-essential make \
+ && apt install -y build-essential make wget \
  && apt clean \
  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+RUN export GO_TAR_GZ=go1.12.6.linux-amd64.tar.gz \
+ && cd /tmp/ \
+ && wget https://dl.google.com/go/$GO_TAR_GZ \
+ && tar -xvf $GO_TAR_GZ \
+ && mv go /usr/local \
+ && rm $GO_TAR_GZ
+
 ARG GIT_REVISION
 
-RUN git clone https://github.com/status-im/nimbus.git \
+RUN export GOROOT=/usr/local/go \
+ && export PATH=$GOROOT/bin:$PATH \
+ && git clone https://github.com/status-im/nimbus.git \
  && cd nimbus \
  && git reset --hard ${GIT_REVISION} \
  && make update deps vendor/go/bin/p2pd nat-libs \
diff --git a/vendor/nim-beacon-chain b/vendor/nim-beacon-chain
index 33a2dc3fc..85f3480f9 160000
--- a/vendor/nim-beacon-chain
+++ b/vendor/nim-beacon-chain
@@ -1 +1 @@
-Subproject commit 33a2dc3fc2c195f314f577b9a4d2df383793f5b2
+Subproject commit 85f3480f90d46c3352329eb3acb135e36c5f4fbf
diff --git a/vendor/nim-eth b/vendor/nim-eth
index 07a273266..8ef04ea0f 160000
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit 07a273266a9f94c9b9b01853e3fc0d30257f2b74
+Subproject commit 8ef04ea0f224290c8cce278f1160ce8d5de09e98