Try to debug a missing .nimble-link for the news package in the docker builds

This commit is contained in:
Zahary Karadjov 2019-06-20 17:06:35 +03:00
parent d10f929d48
commit 016680f5fb
4 changed files with 10 additions and 9 deletions

View File

@ -20,10 +20,11 @@ RUN export GOROOT=/usr/local/go \
&& cd nimbus \ && cd nimbus \
&& git reset --hard ${GIT_REVISION} \ && git reset --hard ${GIT_REVISION} \
&& make update deps vendor/go/bin/p2pd nat-libs \ && 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
ARG NETWORK_BACKEND ARG NETWORK_TYPE
RUN cd nimbus \ RUN cd nimbus \
&& set -a \ && set -a \
@ -33,7 +34,7 @@ RUN cd nimbus \
-d:release \ -d:release \
--debugger:native \ --debugger:native \
--debugInfo \ --debugInfo \
-d:"network_type=${NETWORK_BACKEND}" \ -d:"network_type=${NETWORK_TYPE}" \
-d:SHARD_COUNT=${SHARD_COUNT} \ -d:SHARD_COUNT=${SHARD_COUNT} \
-d:SLOTS_PER_EPOCH=${SLOTS_PER_EPOCH} \ -d:SLOTS_PER_EPOCH=${SLOTS_PER_EPOCH} \
-d:SECONDS_PER_SLOT=${SECONDS_PER_SLOT} \ -d:SECONDS_PER_SLOT=${SECONDS_PER_SLOT} \

View File

@ -2,17 +2,17 @@
GIT_REVISION ?= $(git rev-parse HEAD) GIT_REVISION ?= $(git rev-parse HEAD)
NETWORK ?= testnet0 NETWORK ?= testnet1
NETWORK_BACKEND ?= rlpx NETWORK_TYPE ?= libp2p_spec
IMAGE_TAG ?= $(NETWORK)-$(NETWORK_BACKEND) IMAGE_TAG ?= $(NETWORK)
IMAGE_NAME ?= statusteam/nimbus_beacon_node:$(IMAGE_TAG) IMAGE_NAME ?= statusteam/nimbus_beacon_node:$(IMAGE_TAG)
build: $(NIX_INSTALL) build: $(NIX_INSTALL)
docker build \ docker build \
--build-arg="GIT_REVISION=$(GIT_REVISION)" \ --build-arg="GIT_REVISION=$(GIT_REVISION)" \
--build-arg="NETWORK=$(NETWORK)" \ --build-arg="NETWORK=$(NETWORK)" \
--build-arg="NETWORK_BACKEND=$(NETWORK_BACKEND)" \ --build-arg="NETWORK_TYPE=$(NETWORK_TYPE)" \
-t $(IMAGE_NAME) . -t $(IMAGE_NAME) .
push: build push: build

View File

@ -14,7 +14,7 @@ fi
buildAndPush() { buildAndPush() {
export NETWORK=$1 export NETWORK=$1
export NETWORK_BACKEND=$2 export NETWORK_TYPE=$2
(cd beacon_node && make push) (cd beacon_node && make push)
} }

@ -1 +1 @@
Subproject commit beca856bedaa8513e22f68973ed12f58dff68fdd Subproject commit 681fc2dd36ff865c6dae50ed5b69587bc235e2a4