From 61f099c3ef58a6aa803cc8642668204fca7fb26f Mon Sep 17 00:00:00 2001 From: Vladimir Sinitcin Date: Fri, 15 Dec 2023 13:47:00 +0700 Subject: [PATCH] Dockerfile fixes --- Dockerfile | 11 +++-------- Dockerfile.ci | 10 +++------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9b47a5b71..fb175d359 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,16 +3,11 @@ FROM golang:1.20.6-bullseye as builder WORKDIR /core COPY ./ /core -RUN wget https://github.com/WebAssembly/wabt/releases/download/1.0.17/wabt-1.0.17-ubuntu.tar.gz -RUN tar -zxf wabt-1.0.17-ubuntu.tar.gz -RUN cp wabt-1.0.17/bin/wat2wasm /usr/local/bin - -RUN make install && make faucet - RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates - RUN apt-get update && apt-get install -y wget +RUN make install && make faucet + COPY ./docker-config/validator1/ validator1/ COPY ./docker-config/validator2/ validator2/ COPY ./docker-config/validator3/ validator3/ @@ -21,4 +16,4 @@ COPY ./docker-config/validator4/ validator4/ # generated genesis COPY ./docker-config/genesis.json genesis.json -CMD ["bandd", "--help"] +CMD ["odind", "--help"] diff --git a/Dockerfile.ci b/Dockerfile.ci index 2dadb5f28..36e24ae45 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,18 +1,14 @@ -FROM golang:1.18-buster as builder +FROM golang:1.20-buster as builder WORKDIR /core COPY ./ /core -RUN wget https://github.com/WebAssembly/wabt/releases/download/1.0.17/wabt-1.0.17-ubuntu.tar.gz -RUN tar -zxf wabt-1.0.17-ubuntu.tar.gz -RUN cp wabt-1.0.17/bin/wat2wasm /usr/local/bin - -RUN make install && make faucet RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates - RUN apt-get update && apt-get install -y wget +RUN make install && make faucet + COPY ./docker-config/validator1/ validator1/ COPY ./docker-config/validator2/ validator2/ COPY ./docker-config/validator3/ validator3/