addressed PR comments

.github/workflows/release.yml

@@ -14,7 +14,6 @@ jobs:
         with:
           persist-credentials: false
           path: coreumbridge-xrpl
-          ref: milad/release
           fetch-depth: 0
       - name: Login to DockerHub
         uses: docker/login-action@v2
@@ -29,7 +28,7 @@ jobs:
         run: |
           mkdir ~/release-build
           cd coreumbridge-xrpl
-          make build-relayer-release BUILD_DIR=~/release-build
+          make release-relayer BUILD_DIR=~/release-build
           make build-contract BUILD_DIR=~/release-build
           sha256sum ~/release-build/* > ~/release-build/checksums.txt
       - name: Create release

Makefile

@@ -7,40 +7,43 @@ RELAYER_DIR:=$(ROOT_DIR)/relayer
 BUILD_DIR?=$(ROOT_DIR)/build
 GIT_TAG:=$(shell git describe --tags --exact-match 2>/dev/null)
 GIT_SHA:=$(shell git rev-parse HEAD)
-GIT_VERSION:=$(shell git describe --tags --exact-match 2>/dev/null || git rev-parse HEAD)
+DOCKER_PUSH_TAG?=$(shell git describe --tags --exact-match 2>/dev/null || git rev-parse HEAD)
 LD_FLAGS:="-extldflags=-static \
--X 'github.com/CoreumFoundation/coreumbridge-xrpl/relayer/cmd/cli.VersionTag=$(GIT_TAG)' \
--X 'github.com/CoreumFoundation/coreumbridge-xrpl/relayer/cmd/cli.GitCommit=$(GIT_SHA)' \
+-X 'github.com/CoreumFoundation/coreumbridge-xrpl/relayer/runner.VersionTag=$(GIT_TAG)' \
+-X 'github.com/CoreumFoundation/coreumbridge-xrpl/relayer/runner.GitCommit=$(GIT_SHA)' \
 "
+GOOS?=
+GOARCH?=
+BINARY_NAME?=coreumbridge-xrpl-relayer
 
 ###############################################################################
 ###                                  Build                                  ###
 ###############################################################################
 
 .PHONY: build-relayer
 build-relayer:
-	cd $(RELAYER_DIR) && CGO_ENABLED=0 go build --trimpath -mod=readonly $(LD_FLAGS)  -o $(BUILD_DIR)/coreumbridge-xrpl-relayer ./cmd
+	cd $(RELAYER_DIR) && CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build --trimpath -mod=readonly -ldflags $(LD_FLAGS)  -o $(BUILD_DIR)/$(BINARY_NAME) ./cmd
 
-.PHONY: build-relayer-release
-build-relayer-release:
-	cd $(RELAYER_DIR) && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build --trimpath -mod=readonly -ldflags $(LD_FLAGS)  -o $(BUILD_DIR)/relayer-linux-amd64 ./cmd
-	cd $(RELAYER_DIR) && CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build --trimpath -mod=readonly -ldflags $(LD_FLAGS)  -o $(BUILD_DIR)/relayer-darwin-amd64 ./cmd
-	cd $(RELAYER_DIR) && CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build --trimpath -mod=readonly -ldflags $(LD_FLAGS)  -o $(BUILD_DIR)/relayer-darwin-arm64 ./cmd
+.PHONY: release-relayer
+release-relayer:
+	@$(MAKE) build-relayer-in-docker GOOS=linux GOARCH=amd64 BINARY_NAME=relayer-linux-amd64
+	@$(MAKE) build-relayer-in-docker GOOS=darwin GOARCH=amd64 BINARY_NAME=relayer-darwin-amd64
+	@$(MAKE) build-relayer-in-docker GOOS=darwin GOARCH=arm64 BINARY_NAME=relayer-darwin-arm64
 
 .PHONY: build-relayer-docker
 build-relayer-docker:
-	docker buildx build -f $(RELAYER_DIR)/Dockerfile . -t coreumbridge-xrpl-relayer:local
+	docker buildx build --build-arg GOOS=$(GOOS) --build-arg GOARCH=$(GOARCH) -f $(RELAYER_DIR)/Dockerfile . -t coreumbridge-xrpl-relayer:local
 
 .PHONY: push-relayer-docker
 push-relayer-docker: build-relayer-docker
-	docker image tag coreumbridge-xrpl-relayer:local coreumfoundation/coreumbridge-xrpl-relayer:$(GIT_VERSION)
-	docker image push coreumfoundation/coreumbridge-xrpl-relayer:$(GIT_VERSION)
+	docker image tag coreumbridge-xrpl-relayer:local coreumfoundation/coreumbridge-xrpl-relayer:$(DOCKER_PUSH_TAG)
+	docker image push coreumfoundation/coreumbridge-xrpl-relayer:$(DOCKER_PUSH_TAG)
 
 .PHONY: build-relayer-in-docker
 build-relayer-in-docker:
 	make build-relayer-docker
 	mkdir -p $(BUILD_DIR)
-	docker run --rm --entrypoint cat coreumbridge-xrpl-relayer:local /app/coreumbridge-xrpl-relayer > $(BUILD_DIR)/coreumbridge-xrpl-relayer
+	docker run --rm --entrypoint cat coreumbridge-xrpl-relayer:local /app/coreumbridge-xrpl-relayer > $(BUILD_DIR)/$(BINARY_NAME)
 
 .PHONY: build-contract
 build-contract:

relayer/Dockerfile

@@ -1,6 +1,6 @@
 FROM --platform=$BUILDPLATFORM golang:1.21.2-alpine3.18 as builder
 
-RUN apk add --no-cache make
+RUN apk add --no-cache make git
 
 COPY relayer/go.mod relayer/go.sum /code/relayer/
 
@@ -10,10 +10,14 @@ RUN go mod download
 
 COPY Makefile /code/Makefile
 COPY relayer /code/relayer
+COPY .git /code/.git
 
 WORKDIR /code
 
-RUN make build-relayer
+ARG GOOS=linux
+ARG GOARCH=amd64
+
+RUN make build-relayer GOOS=${GOOS} GOARCH=${GOARCH}
 
 FROM --platform=$TARGETPLATFORM  alpine:3.18
 

relayer/cmd/cli/cli.go

@@ -891,3 +891,21 @@ func getConsoleLogger() (*logger.ZapLogger, error) {
 
 	return zapLogger, nil
 }
+
+// VersionCommand returns a CLI command to interactively print the application binary version information.
+func VersionCommand() *cobra.Command {
+	return &cobra.Command{
+		Use:   "version",
+		Short: "Print the application binary version information",
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			fmt.Printf(`
+Git Tag: %s,
+Git Commit: %s,
+`,
+				runner.VersionTag,
+				runner.GitCommit,
+			)
+			return nil
+		},
+	}
+}

relayer/runner/runner.go

@@ -42,6 +42,12 @@ const (
 	DefaultCoreumChainID = coreumchainconstant.ChainIDMain
 )
 
+// Build vars, that must be passed at build time.
+var (
+	VersionTag = "devel"
+	GitCommit  = ""
+)
+
 // ******************** Config ********************
 
 // LoggingConfig is logging config.