Skip to content

Commit

Permalink
Merge branch 'staging' into fix/refactor-zboxcore
Browse files Browse the repository at this point in the history
# Conflicts:
#	go.mod
#	go.sum
  • Loading branch information
Jayashsatolia403 committed Aug 25, 2024
2 parents 594560f + 8c9fdd5 commit d7af6fe
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-s3-migration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup go 1.20
uses: actions/setup-go@v3
with:
go-version: '1.20' # The Go version to download (if necessary) and use.
go-version: '1.22' # The Go version to download (if necessary) and use.

- name: Checkout
uses: actions/checkout@v2
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Install
run: |
docker run --rm -v $PWD:/s3mgrt --workdir=/s3mgrt golang:1.20.4 make build
docker run --rm -v $PWD:/s3mgrt --workdir=/s3mgrt golang:1.22.5 make build
# - name: Zip release
# run: tar -czvf s3mgrt-linux.tar.gz ./s3mgrt
Expand Down
12 changes: 6 additions & 6 deletions docker.local/base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM golang:1.20.4 as zbox_base
FROM golang:1.22.5 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 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 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

0 comments on commit d7af6fe

Please sign in to comment.