From f21f1022633150b0712075bd29467a897f931523 Mon Sep 17 00:00:00 2001 From: Manohar Reddy Date: Thu, 22 Jun 2023 19:48:33 +0200 Subject: [PATCH] update gosdk --- .github/workflows/build-s3-migration.yaml | 3 +-- docker.local/base.Dockerfile | 4 ++-- go.mod | 6 +++--- go.sum | 8 ++++---- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-s3-migration.yaml b/.github/workflows/build-s3-migration.yaml index 76d374c..f0989c9 100644 --- a/.github/workflows/build-s3-migration.yaml +++ b/.github/workflows/build-s3-migration.yaml @@ -55,8 +55,7 @@ jobs: - name: Install run: | - docker build -t zbox_base -f docker.local/base.Dockerfile . - docker run --rm -v $PWD:/migrate --workdir=/migrate zbox_base make build + docker run --rm -v $PWD:/s3mgrt --workdir=/s3mgrt golang:1.20.4 make build - name: Zip release run: tar -czvf s3mgrt-linux.tar.gz ./s3mgrt diff --git a/docker.local/base.Dockerfile b/docker.local/base.Dockerfile index 9be06e7..17294ab 100644 --- a/docker.local/base.Dockerfile +++ b/docker.local/base.Dockerfile @@ -1,8 +1,8 @@ -FROM golang:1.20.4-alpine3.18 as zbox_base +FROM golang:1.20.4 as zbox_base RUN apk add --update --no-cache linux-headers build-base git cmake bash perl grep py3-pip python3-dev curl RUN apk upgrade # Install Herumi's cryptography RUN apk del libstdc++ gmp-dev openssl-dev vips-dev - RUN apk add --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main libstdc++ gmp-dev openssl-dev vips-dev + RUN apk add --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main libstdc++ gmp-dev openssl-dev vips-dev diff --git a/go.mod b/go.mod index 25e7114..f1ef09e 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/0chain/errors v1.0.3 - github.com/0chain/gosdk v1.8.17-0.20230613172735-1ed7418612be + github.com/0chain/gosdk v1.8.17-0.20230621142422-380850c6e36f github.com/aws/aws-sdk-go-v2 v1.17.1 github.com/aws/aws-sdk-go-v2/config v1.17.10 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.37 @@ -46,7 +46,7 @@ require ( github.com/gorilla/websocket v1.5.0 // indirect github.com/h2non/filetype v1.1.3 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/herumi/bls-go-binary v1.30.4 // indirect + github.com/herumi/bls-go-binary v1.31.0 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect @@ -85,4 +85,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/herumi/bls-go-binary => github.com/cnlangzi/bls-go-binary v1.30.7 +replace github.com/herumi/bls-go-binary => github.com/boddumanohar/bls-go-binary v1.30.8 diff --git a/go.sum b/go.sum index e8755f4..e468a06 100644 --- a/go.sum +++ b/go.sum @@ -40,8 +40,8 @@ github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565 h1:z+DtCR8mBsjPnEs github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565/go.mod h1:UyDC8Qyl5z9lGkCnf9RHJPMektnFX8XtCJZHXCCVj8E= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= -github.com/0chain/gosdk v1.8.17-0.20230613172735-1ed7418612be h1:BkJPrh+HgMoDRtNrOrbRxn6b23TZkAci2APPxhnb9Do= -github.com/0chain/gosdk v1.8.17-0.20230613172735-1ed7418612be/go.mod h1:YWr9ZGV76N9LWEO3AIys5ao3GI9kVDcrVHDIlV3RJKU= +github.com/0chain/gosdk v1.8.17-0.20230621142422-380850c6e36f h1:pUR6NmyUDqkR4sp8Wr1QVW/04Izs5JoPFIn0rc1dQj8= +github.com/0chain/gosdk v1.8.17-0.20230621142422-380850c6e36f/go.mod h1:GgqNjoHBO0JN9TcpDAC28/VE2VsZi4MDr4qGdzfWV+I= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Luzifer/go-openssl/v3 v3.1.0 h1:QqKqo6kYXGGUsvtUoCpRZm8lHw+jDfhbzr36gVj+/gw= @@ -88,6 +88,8 @@ github.com/aws/smithy-go v1.13.4 h1:/RN2z1txIJWeXeOkzX+Hk/4Uuvv7dWtCjbmVJcrskyk= github.com/aws/smithy-go v1.13.4/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/boddumanohar/bls-go-binary v1.30.8 h1:nQ3beJWGsYsHckTx8z2RQQkPX3Pew+iJHcG/LAWmQzU= +github.com/boddumanohar/bls-go-binary v1.30.8/go.mod h1:O4Vp1AfR4raRGwFeQpr9X/PQtncEicMoOe6BQt1oX0Y= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M= github.com/btcsuite/btcd v0.23.0/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY= @@ -124,8 +126,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cnlangzi/bls-go-binary v1.30.7 h1:mI7hgGyHr0VXU3y4GZwPHvSMzYU28s94KTKehoprPFg= -github.com/cnlangzi/bls-go-binary v1.30.7/go.mod h1:O4Vp1AfR4raRGwFeQpr9X/PQtncEicMoOe6BQt1oX0Y= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=