From 9fe7302a4dfaedd35b84b5c1cb14aaaa2df6cd3f Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Mon, 27 Jul 2020 16:05:28 +0200 Subject: [PATCH 1/2] Disable ledger in dockerfile (can you reach it anyway?) --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f46830980d..32fbd7f31b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,8 +24,8 @@ RUN export GO_WASM_DIR=$(go list -f "{{ .Dir }}" -m github.com/CosmWasm/go-cosmw FROM cosmwasm/go-ext-builder:0.8.2-alpine AS go-builder RUN apk add git -# without this, build with LEDGER_ENABLED=false -RUN apk add libusb-dev linux-headers +# NOTE: add these to run with LEDGER_ENABLED=true +# RUN apk add libusb-dev linux-headers WORKDIR /code COPY . /code/ @@ -33,7 +33,7 @@ COPY . /code/ COPY --from=rust-builder /lib/libgo_cosmwasm_muslc.a /lib/libgo_cosmwasm_muslc.a # force it to use static lib (from above) not standard libgo_cosmwasm.so file -RUN BUILD_TAGS=muslc make build +RUN LEDGER_ENABLED=false BUILD_TAGS=muslc make build # -------------------------------------------------------- FROM alpine:3.12 From 06c5e3a208afde31742552abe405af484db5f374 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Mon, 27 Jul 2020 16:12:25 +0200 Subject: [PATCH 2/2] Add coral testnet to Dockerfile --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index 32fbd7f31b..12e59569d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,6 +34,8 @@ COPY --from=rust-builder /lib/libgo_cosmwasm_muslc.a /lib/libgo_cosmwasm_muslc.a # force it to use static lib (from above) not standard libgo_cosmwasm.so file RUN LEDGER_ENABLED=false BUILD_TAGS=muslc make build +# we also (temporarily) build the testnet binaries here +RUN LEDGER_ENABLED=false BUILD_TAGS=muslc make build-coral # -------------------------------------------------------- FROM alpine:3.12 @@ -42,6 +44,10 @@ COPY --from=go-builder /code/build/wasmd /usr/bin/wasmd COPY --from=go-builder /code/build/wasmgovd /usr/bin/wasmgovd COPY --from=go-builder /code/build/wasmcli /usr/bin/wasmcli +# testnet +COPY --from=go-builder /code/build/coral /usr/bin/coral +COPY --from=go-builder /code/build/corald /usr/bin/corald + COPY docker/* /opt/ RUN chmod +x /opt/*.sh