Skip to content

Commit

Permalink
Upgrade to cosmos-sdk v0.50
Browse files Browse the repository at this point in the history
  • Loading branch information
rkollar committed Sep 17, 2024
1 parent f3da26c commit 8feb582
Show file tree
Hide file tree
Showing 129 changed files with 1,364 additions and 3,559 deletions.
20 changes: 11 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
ARG GO_VERSION="1.20"
ARG RUNNER_IMAGE="golang:${GO_VERSION}-alpine3.17"
ARG GO_VERSION="1.22.5"
FROM golang:${GO_VERSION}-bookworm AS build-env
ARG GITHUB_USER
ARG GITHUB_TOKEN

FROM golang:${GO_VERSION}-bullseye AS build-env

WORKDIR /go/src/github.com/sagaxyz/sagacli
WORKDIR /root

RUN apt-get update -y

COPY . .

RUN git config --global --add url."https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
RUN make build

FROM ${RUNNER_IMAGE}
FROM golang:${GO_VERSION}-alpine3.20

COPY --from=build-env /go/src/github.com/sagaxyz/sagacli/build/sscd /usr/bin/sscd
COPY --from=build-env /root/build/sscd /usr/bin/
COPY --from=build-env /root/start.sh /root/

RUN apk add gcompat bash
RUN apk add gcompat bash curl

EXPOSE 26656
EXPOSE 26660
EXPOSE 26657
EXPOSE 1317
EXPOSE 9090

CMD ["sscd", "start"]
CMD ["bash","/root/start.sh"]
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,10 @@ all: tools build lint test vulncheck
# .PHONY: build build-linux-amd64 build-linux-arm64 cosmovisor


# mocks: $(MOCKS_DIR)
# @go install github.com/golang/mock/mockgen@v1.6.0
# sh ./scripts/mockgen.sh
# .PHONY: mocks
mocks: $(MOCKS_DIR)
@go install github.com/golang/mock/mockgen@v1.6.0
sh ./scripts/mockgen.sh
.PHONY: mocks


# vulncheck: $(BUILDDIR)/
Expand Down Expand Up @@ -605,4 +605,4 @@ release:
ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
release --rm-dist --skip-validate

.PHONY: release-dry-run release
.PHONY: release-dry-run release
4 changes: 2 additions & 2 deletions app/ante/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
sagaante "github.com/sagaxyz/saga-sdk/ante"
)

Expand Down
Loading

0 comments on commit 8feb582

Please sign in to comment.