Skip to content

Commit

Permalink
use the 3.18 go alpine image (#1687) (#1688)
Browse files Browse the repository at this point in the history
  • Loading branch information
tudor-malene authored Dec 11, 2023
1 parent 4eb837e commit 2fa6089
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion dockerfiles/enclave.debug.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# build-enclave = copies over the source and builds the enclave using a go compiler cache
# final = using the base system copies over only the enclave executable and creates the final image without source and dependencies.

FROM golang:1.20-alpine as system
FROM golang:1.20-alpine3.18 as system

# install build utils
RUN apk add build-base
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/host.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# build-host = copies over the source code and builds the binaries using a compiler cache
# final = copies over only the executables in an alpine image that doesn't have any additional load.

FROM golang:1.20-alpine as system
FROM golang:1.20-alpine3.18 as system
# set the base libs to build / run
RUN apk add build-base bash
ENV CGO_ENABLED=1
Expand All @@ -31,7 +31,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
go build

# Trigger another build stage to remove unnecessary files.
FROM alpine:3.17
FROM alpine:3.18

# Copy over just the binary from the previous build stage into this one.
COPY --from=build-host \
Expand Down
2 changes: 1 addition & 1 deletion tools/hardhatdeployer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# final = copies over the solidity/hardhat source, takes the installed project from the 'install-npm-deps' and the final wallet executable
# in a lightweight image.

FROM golang:1.20-alpine as system
FROM golang:1.20-alpine3.18 as system

# set the base libs to build / run
RUN apk add build-base bash git
Expand Down
4 changes: 2 additions & 2 deletions tools/obscuroscan/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# build-obscuroscan = copies over the source code and builds the binaries using a compiler cache
# final = copies over only the executables in an alpine image that doesn't have any additional load.

FROM golang:1.20-alpine as system
FROM golang:1.20-alpine3.18 as system

# set the base libs to build / run
RUN apk add build-base bash git
Expand All @@ -31,7 +31,7 @@ WORKDIR /home/obscuro/go-obscuro/tools/obscuroscan/main
RUN --mount=type=cache,target=/root/.cache/go-build \
go build

FROM alpine:3.17
FROM alpine:3.18

COPY --from=build-obscuroscan /home/obscuro/go-obscuro/tools/obscuroscan/main /home/obscuro/go-obscuro/tools/obscuroscan/main
WORKDIR /home/obscuro/go-obscuro
4 changes: 2 additions & 2 deletions tools/walletextension/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# build-wallet = copies over the source code and builds the binaries using a compiler cache
# final = copies over only the executables in an alpine image that doesn't have any additional load.

FROM golang:1.20-alpine as system
FROM golang:1.20-alpine3.18 as system

# set the base libs to build / run
RUN apk add build-base bash git
Expand Down Expand Up @@ -33,7 +33,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
go build -o ../bin/wallet_extension_linux

# Lightweight final build stage. Includes bare minimum to start wallet extension
FROM alpine:3.17
FROM alpine:3.18

COPY --from=build-wallet /home/obscuro/go-obscuro/tools/walletextension/bin /home/obscuro/go-obscuro/tools/walletextension/bin
WORKDIR /home/obscuro/go-obscuro/tools/walletextension/bin

0 comments on commit 2fa6089

Please sign in to comment.