From 9536419669b6b2533cfddec9f3e2c5d09b467c3c Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Fri, 23 Jun 2023 11:42:01 +0200 Subject: [PATCH 1/2] fix dockerfile --- contrib/images/umee.e2e.dockerfile | 2 +- contrib/images/umeed.dockerfile | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/contrib/images/umee.e2e.dockerfile b/contrib/images/umee.e2e.dockerfile index b7adabc004..6a0bec8bb6 100644 --- a/contrib/images/umee.e2e.dockerfile +++ b/contrib/images/umee.e2e.dockerfile @@ -21,7 +21,7 @@ RUN if [ "$EXPERIMENTAL" = "true" ] ; then echo "Installing experimental build"; RUN BUILD_TAGS=badgerdb make install ## Prepare the final clear binary -FROM ubuntu:rolling +FROM ubuntu:23.04 EXPOSE 26656 26657 1317 9090 7171 ENTRYPOINT ["umeed", "start"] diff --git a/contrib/images/umeed.dockerfile b/contrib/images/umeed.dockerfile index 2f996ee392..5e0988419e 100644 --- a/contrib/images/umeed.dockerfile +++ b/contrib/images/umeed.dockerfile @@ -14,15 +14,14 @@ RUN LEDGER_ENABLED=false BUILD_TAGS=badgerdb make install # Stage-2: copy binary and required artifacts to a fresh image # we need to use debian compatible system. -FROM ubuntu:rolling +FROM ubuntu:23.04 EXPOSE 26656 26657 1317 9090 -CMD ["umeed"] # Run umeed by default, omit entrypoint to ease using container with CLI +CMD ["umeed"] STOPSIGNAL SIGTERM RUN apt-get update && apt-get install ca-certificates -y \ - && addgroup --gid 1000 umee \ - && useradd -u 1000 -g umee -m umee + && groupadd umee && useradd -g umee -m umee COPY --from=builder /go/bin/umeed /usr/local/bin/ COPY --from=builder /go/pkg/mod/github.com/\!cosm\!wasm/wasmvm\@v*/internal/api/libwasmvm.*.so /usr/lib/ From 3fd45ccc9efa2f75bc3d513917420128a6e9a1c7 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Fri, 23 Jun 2023 11:42:59 +0200 Subject: [PATCH 2/2] test trigger --- util/store/iter_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/store/iter_test.go b/util/store/iter_test.go index 84908264be..7322d41956 100644 --- a/util/store/iter_test.go +++ b/util/store/iter_test.go @@ -53,13 +53,13 @@ func TestSumCoins(t *testing.T) { }{ {"atom", 1}, {"umee", 8}, - {"atom", 8}, // we overwrite + {"atom", 7}, // overwrite the previous value {"ato", 2}, {"atoma", 3}, } expected := sdk.NewCoins( sdk.NewInt64Coin("ato", 2), - sdk.NewInt64Coin("atom", 8), + sdk.NewInt64Coin("atom", 7), sdk.NewInt64Coin("atoma", 3), sdk.NewInt64Coin("umee", 8))