Skip to content

Commit

Permalink
update debian buster to latest, rust to 1.50.0, don't install git (al…
Browse files Browse the repository at this point in the history
…ready installed)
  • Loading branch information
greenaddress committed Feb 17, 2021
1 parent eda5e5a commit 2b175a0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
@@ -1,6 +1,6 @@
FROM blockstream/esplora-base:latest AS build

FROM debian:buster@sha256:e2cc6fb403be437ef8af68bdc3a89fd58e80b4e390c58f14c77c466002391193
FROM debian:buster@sha256:1092695e843ad975267131f27a2b523128c4e03d2d96574bbdd7cf949ed51475

COPY --from=build /srv/explorer /srv/explorer
COPY --from=build /srv/wally_wasm /srv/wally_wasm
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile.deps
Expand Up @@ -6,14 +6,13 @@ ENV EXPORTED_FUNCTIONS="['_malloc', '_free', '_wally_init','_wally_asset_value_c
ENV EXTRA_EXPORTED_RUNTIME_METHODS="['getValue', 'ccall']"
ENV EMCC_OPTIONS="-s MODULARIZE=1 -s EXPORT_NAME=InitWally"
RUN sh -c '[ -n "$NO_LIQUID" ] && mkdir -p /wally/wasm_dist || ( \
apt-get -qq update && apt-get -yqq install git \
&& cd /opt/emsdk && . ./emsdk_env.sh \
cd /opt/emsdk && . ./emsdk_env.sh \
&& git clone --no-checkout https://github.com/elementsproject/libwally-core /wally \
&& cd /wally && git checkout ea984fc07f4f450b33d4eb78756f25f553e60b44 \
&& git submodule sync --recursive && git submodule update --init --recursive \
&& ./tools/build_wasm.sh --enable-elements)'

FROM debian:buster@sha256:e2cc6fb403be437ef8af68bdc3a89fd58e80b4e390c58f14c77c466002391193
FROM debian:buster@sha256:1092695e843ad975267131f27a2b523128c4e03d2d96574bbdd7cf949ed51475
SHELL ["/bin/bash", "-c"]

RUN mkdir -p /srv/explorer \
Expand Down Expand Up @@ -42,7 +41,7 @@ RUN curl -sL -o elements.tar.gz https://github.com/ElementsProject/elements/rele
&& mv /srv/explorer/liquid/bin/{elements-cli,liquid-cli} \
&& rm elements.tar.gz

RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.48.0
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.50.0
RUN source /root/.cargo/env \
&& mkdir -p /srv/explorer/electrs{,_liquid} \
&& git clone --no-checkout https://github.com/blockstream/electrs.git \
Expand Down

0 comments on commit 2b175a0

Please sign in to comment.