Skip to content

Commit

Permalink
Merge branch 'main' into sai/qa_dockernet
Browse files Browse the repository at this point in the history
  • Loading branch information
gsk967 authored Jun 23, 2023
2 parents 426c99c + 1972cf9 commit c755f6a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion contrib/images/umee.e2e.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
7 changes: 3 additions & 4 deletions contrib/images/umeed.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
4 changes: 2 additions & 2 deletions util/store/iter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down

0 comments on commit c755f6a

Please sign in to comment.