From 64b71511d2f89f868aa0fe60e98a3350863e9951 Mon Sep 17 00:00:00 2001 From: miiu Date: Tue, 18 Feb 2025 17:02:23 +0200 Subject: [PATCH 1/5] new mx-chain-core-go --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b3311d5f..de8193b5 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/gin-contrib/pprof v1.4.0 github.com/gin-contrib/static v0.0.1 github.com/gin-gonic/gin v1.9.1 - github.com/multiversx/mx-chain-core-go v1.2.24 + github.com/multiversx/mx-chain-core-go v1.2.25-0.20250218100805-a36ccef5de49 github.com/multiversx/mx-chain-crypto-go v1.2.12 github.com/multiversx/mx-chain-es-indexer-go v1.7.13 github.com/multiversx/mx-chain-logger-go v1.0.15 diff --git a/go.sum b/go.sum index 87e2a002..f7b88c28 100644 --- a/go.sum +++ b/go.sum @@ -129,8 +129,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= -github.com/multiversx/mx-chain-core-go v1.2.24 h1:O0X7N9GfNVUCE9fukXA+dvfCRRjViYn88zOaE7feUog= -github.com/multiversx/mx-chain-core-go v1.2.24/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE= +github.com/multiversx/mx-chain-core-go v1.2.25-0.20250218100805-a36ccef5de49 h1:I7s2/YpN5zlJDxx+D5jk4IJHIRsrXNjtyROjUNWGFc4= +github.com/multiversx/mx-chain-core-go v1.2.25-0.20250218100805-a36ccef5de49/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE= github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk= github.com/multiversx/mx-chain-crypto-go v1.2.12/go.mod h1:HzcPpCm1zanNct/6h2rIh+MFrlXbjA5C8+uMyXj3LI4= github.com/multiversx/mx-chain-es-indexer-go v1.7.13 h1:1Boeb0x28fzYBVRlnaCPRaXifRXAFiCit34t6O8efyM= From 780b75d4342b7c199575fab441bb7392ed3b4bb8 Mon Sep 17 00:00:00 2001 From: miiu Date: Fri, 21 Feb 2025 13:07:06 +0200 Subject: [PATCH 2/5] latest mx-chain-core-go version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index de8193b5..2e5191b7 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/gin-contrib/pprof v1.4.0 github.com/gin-contrib/static v0.0.1 github.com/gin-gonic/gin v1.9.1 - github.com/multiversx/mx-chain-core-go v1.2.25-0.20250218100805-a36ccef5de49 + github.com/multiversx/mx-chain-core-go v1.2.25-0.20250221110620-85f06721ec32 github.com/multiversx/mx-chain-crypto-go v1.2.12 github.com/multiversx/mx-chain-es-indexer-go v1.7.13 github.com/multiversx/mx-chain-logger-go v1.0.15 diff --git a/go.sum b/go.sum index f7b88c28..be80d33c 100644 --- a/go.sum +++ b/go.sum @@ -129,8 +129,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= -github.com/multiversx/mx-chain-core-go v1.2.25-0.20250218100805-a36ccef5de49 h1:I7s2/YpN5zlJDxx+D5jk4IJHIRsrXNjtyROjUNWGFc4= -github.com/multiversx/mx-chain-core-go v1.2.25-0.20250218100805-a36ccef5de49/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE= +github.com/multiversx/mx-chain-core-go v1.2.25-0.20250221110620-85f06721ec32 h1:0Al7jCPcLGs8jgzrle2Pa3j+2oKsv2WXMWjS2fv0bfo= +github.com/multiversx/mx-chain-core-go v1.2.25-0.20250221110620-85f06721ec32/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE= github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk= github.com/multiversx/mx-chain-crypto-go v1.2.12/go.mod h1:HzcPpCm1zanNct/6h2rIh+MFrlXbjA5C8+uMyXj3LI4= github.com/multiversx/mx-chain-es-indexer-go v1.7.13 h1:1Boeb0x28fzYBVRlnaCPRaXifRXAFiCit34t6O8efyM= From 528da90e85bdc65e012dc2ab9e3003995f22c4e3 Mon Sep 17 00:00:00 2001 From: danidrasovean Date: Fri, 21 Feb 2025 15:41:35 +0200 Subject: [PATCH 3/5] Update deploy-docker workflow --- .github/workflows/deploy-docker.yaml | 4 ++-- docker/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-docker.yaml b/.github/workflows/deploy-docker.yaml index f4479772..b0363857 100644 --- a/.github/workflows/deploy-docker.yaml +++ b/.github/workflows/deploy-docker.yaml @@ -13,7 +13,7 @@ jobs: build-docker-image: strategy: matrix: - runs-on: [ubuntu-latest] + runs-on: [ubuntu-22.04] runs-on: ${{ matrix.runs-on }} steps: @@ -38,7 +38,7 @@ jobs: - name: Build and push image to Docker Hub id: push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./docker/Dockerfile diff --git a/docker/Dockerfile b/docker/Dockerfile index f377e9fb..5038a037 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.7 as builder +FROM golang:1.20.7 AS builder LABEL maintainer="multiversx" WORKDIR /mx-chain-proxy-go From ea3a40048a0a5bb5d9764a1fb9d096d238ec87fa Mon Sep 17 00:00:00 2001 From: danidrasovean Date: Mon, 24 Feb 2025 16:15:28 +0200 Subject: [PATCH 4/5] Test with newer ubuntu --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5038a037..85cf347b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,7 +9,7 @@ WORKDIR /mx-chain-proxy-go/cmd/proxy RUN go build -ldflags="-X main.appVersion=$(git describe --tags --long --dirty) -X main.commitID=$(git rev-parse HEAD)" # ===== SECOND STAGE ====== -FROM ubuntu:22.04 +FROM ubuntu:24.04 RUN apt-get update -y && apt-get upgrade -y COPY --from=builder /mx-chain-proxy-go/cmd/proxy /mx-chain-proxy-go/cmd/proxy From bfe4e1d9f3926926ba23ba1de403e4972c40264a Mon Sep 17 00:00:00 2001 From: danidrasovean Date: Mon, 24 Feb 2025 17:33:34 +0200 Subject: [PATCH 5/5] Update Dockerfile --- docker/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 85cf347b..dae437ef 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,8 +9,7 @@ WORKDIR /mx-chain-proxy-go/cmd/proxy RUN go build -ldflags="-X main.appVersion=$(git describe --tags --long --dirty) -X main.commitID=$(git rev-parse HEAD)" # ===== SECOND STAGE ====== -FROM ubuntu:24.04 -RUN apt-get update -y && apt-get upgrade -y +FROM ubuntu:22.04 COPY --from=builder /mx-chain-proxy-go/cmd/proxy /mx-chain-proxy-go/cmd/proxy WORKDIR /mx-chain-proxy-go/cmd/proxy/