-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'staging' into fix/refactor-zboxcore
# Conflicts: # go.mod # go.sum
- Loading branch information
Showing
2 changed files
with
8 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |