From 2cf33dbba9a3e2b6601ac457c4a887c8f90012a5 Mon Sep 17 00:00:00 2001 From: danb Date: Wed, 17 Jan 2024 12:48:18 -0500 Subject: [PATCH] image updates --- .github/workflows/docker.yaml | 6 +++--- kujirad/Dockerfile | 4 ++-- odind/Dockerfile | 6 +++--- osmosisd/Dockerfile | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 5ed4399..291ff93 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -25,14 +25,14 @@ jobs: - dockerfile: ./osmosisd/Dockerfile image: ghcr.io/defiantlabs/osmosisd platforms: linux/amd64 - tag: v20.1.0 + tag: v22.0.0 - dockerfile: ./kujirad/Dockerfile image: ghcr.io/defiantlabs/kujirad platforms: linux/amd64 - tag: v0.9.1 + tag: v0.9.3-1 - dockerfile: ./odind/Dockerfile image: ghcr.io/defiantlabs/odind - tag: v0.6.2 + tag: v0.7.7 platforms: linux/amd64 permissions: contents: read diff --git a/kujirad/Dockerfile b/kujirad/Dockerfile index b2aed0c..5213443 100644 --- a/kujirad/Dockerfile +++ b/kujirad/Dockerfile @@ -5,7 +5,7 @@ ARG TARGETPLATFORM # Use muslc for static libs ARG BUILD_TAGS="muslc" -ARG VERSION=v0.9.3 +ARG VERSION=v0.9.3-1 ARG ORACLE_VERSION=v0.9.0 ARG LD_FLAGS=-linkmode=external \ -extldflags '-Wl,-z,muldefs -static' @@ -19,7 +19,7 @@ WORKDIR /go/src/github.com/Team-Kujira RUN git clone https://github.com/Team-Kujira/core.git WORKDIR /go/src/github.com/Team-Kujira/core RUN git fetch -RUN git checkout v0.9.3 +RUN git checkout v0.9.3-1 WORKDIR /go/src/github.com/Team-Kujira/core # Install CosmWasm. diff --git a/odind/Dockerfile b/odind/Dockerfile index 367adce..7e02360 100644 --- a/odind/Dockerfile +++ b/odind/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-buster AS build-env +FROM golang:1.20-buster AS build-env ARG TARGETPLATFORM ARG BUILD_TAGS=netgo @@ -49,8 +49,8 @@ COPY --from=build-env /go/bin/yoda /bin COPY --from=build-env /usr/bin/ldd /bin/ldd COPY --from=build-env /usr/bin/curl /bin/curl COPY --from=build-env /usr/bin/jq /bin/jq -COPY --from=build-env /go/pkg/mod/github.com/odin-protocol/go-owasm@v0.2.5/api/libgo_owasm.so /usr/lib/ -COPY --from=build-env /go/pkg/mod/github.com/!cosm!wasm/wasmvm@v1.5.0/internal/api/libwasmvm.x86_64.so /usr/lib/ +COPY --from=build-env /go/pkg/mod/github.com/odin-protocol/go-owasm@v0.2.*/api/libgo_owasm.so /usr/lib/ +COPY --from=build-env /go/pkg/mod/github.com/!cosm!wasm/wasmvm@v1.*.0/internal/api/libwasmvm.x86_64.so /usr/lib/ RUN apt-get update && apt-get install -y ca-certificates diff --git a/osmosisd/Dockerfile b/osmosisd/Dockerfile index 02e6275..3e645ab 100644 --- a/osmosisd/Dockerfile +++ b/osmosisd/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20-alpine3.16 AS build-env +FROM golang:1.21-alpine3.17 AS build-env # Customize to your build env @@ -71,8 +71,8 @@ COPY --from=build-env /usr/lib/libonig.so.5 /lib COPY --from=build-env /usr/lib/libcurl.so.4 /lib COPY --from=build-env /lib/libz.so.1 /lib COPY --from=build-env /usr/lib/libnghttp2.so.14 /lib -COPY --from=build-env /lib/libssl.so.1.1 /lib -COPY --from=build-env /lib/libcrypto.so.1.1 /lib +COPY --from=build-env /lib/libssl.so* /lib +COPY --from=build-env /lib/libcrypto.so* /lib COPY --from=build-env /usr/lib/libbrotlidec.so.1 /lib COPY --from=build-env /usr/lib/libbrotlicommon.so.1 /lib