From 3830691ae41f91f7381f23976dc733081aea55bc Mon Sep 17 00:00:00 2001 From: Aleksandr Bezobchuk Date: Wed, 20 Apr 2022 14:23:12 -0400 Subject: [PATCH 1/2] updates --- Dockerfile | 2 +- contrib/images/simd-dlv/Dockerfile | 5 +++-- contrib/images/simd-env/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ffcbeccbc15f..026f222c594a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ # > docker run -it -p 26657:26657 -p 26656:26656 -v ~/.simappcli:/root/.simapp simapp simd keys add foo # > docker run -it -p 26657:26657 -p 26656:26656 -v ~/.simappcli:/root/.simapp simapp simd keys list # TODO: demo connecting rest-server (or is this in server now?) -FROM golang:alpine AS build-env +FROM golang:1.18-alpine AS build-env # Install minimum necessary dependencies ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev python3 diff --git a/contrib/images/simd-dlv/Dockerfile b/contrib/images/simd-dlv/Dockerfile index 35680f21f415..30ed840fcb63 100644 --- a/contrib/images/simd-dlv/Dockerfile +++ b/contrib/images/simd-dlv/Dockerfile @@ -1,4 +1,5 @@ -FROM golang:alpine AS build +FROM golang:1.18-alpine AS build + RUN apk add build-base git linux-headers libc-dev RUN go install github.com/go-delve/delve/cmd/dlv@latest WORKDIR /work @@ -20,4 +21,4 @@ WORKDIR /simd EXPOSE 26656 26657 2345 ENTRYPOINT ["/usr/bin/wrapper.sh"] CMD ["start", "--log_format", "plain"] -STOPSIGNAL SIGTERM \ No newline at end of file +STOPSIGNAL SIGTERM diff --git a/contrib/images/simd-env/Dockerfile b/contrib/images/simd-env/Dockerfile index 83b86dce7101..d32fdfe82614 100644 --- a/contrib/images/simd-env/Dockerfile +++ b/contrib/images/simd-env/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine AS build +FROM golang:1.18-alpine AS build RUN apk add build-base git linux-headers WORKDIR /work COPY go.mod go.sum /work/ From 5b3286f062ee6a3e0e63eb60ab607dcefeea1d6d Mon Sep 17 00:00:00 2001 From: Aleksandr Bezobchuk Date: Wed, 20 Apr 2022 14:25:37 -0400 Subject: [PATCH 2/2] updates --- contrib/devtools/Dockerfile | 2 +- contrib/rosetta/rosetta-ci/Dockerfile | 2 +- contrib/rosetta/rosetta-cli/Dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/devtools/Dockerfile b/contrib/devtools/Dockerfile index 8c4bdcd1452b..f94cd50d8044 100644 --- a/contrib/devtools/Dockerfile +++ b/contrib/devtools/Dockerfile @@ -4,7 +4,7 @@ FROM bufbuild/buf:1.1.0 as BUILDER -FROM golang:alpine +FROM golang:1.18-alpine RUN apk add --no-cache \ nodejs \ diff --git a/contrib/rosetta/rosetta-ci/Dockerfile b/contrib/rosetta/rosetta-ci/Dockerfile index 34cc6512e989..d4cfc58528e9 100644 --- a/contrib/rosetta/rosetta-ci/Dockerfile +++ b/contrib/rosetta/rosetta-ci/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine as build +FROM golang:1.18-alpine as build RUN apk add --no-cache tar git diff --git a/contrib/rosetta/rosetta-cli/Dockerfile b/contrib/rosetta/rosetta-cli/Dockerfile index aa1f16146f14..da6ef2879239 100644 --- a/contrib/rosetta/rosetta-cli/Dockerfile +++ b/contrib/rosetta/rosetta-cli/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine as build +FROM golang:1.18-alpine as build RUN apk add git gcc libc-dev --no-cache @@ -15,4 +15,4 @@ RUN apk add gcc libc-dev python3 --no-cache ENV PATH=$PATH:/bin -COPY --from=build /rosetta/rosetta-cli /bin/rosetta-cli \ No newline at end of file +COPY --from=build /rosetta/rosetta-cli /bin/rosetta-cli