Skip to content

Commit

Permalink
change docker trigger branch for test 7
Browse files Browse the repository at this point in the history
  • Loading branch information
mask-pp committed May 7, 2024
1 parent 0bc9162 commit 3d36bc1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
23 changes: 12 additions & 11 deletions .github/workflows/docker_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,21 @@ jobs:
type=ref,event=tag
type=sha
- name: Go Build Cache for Docker
uses: actions/cache@v3
- name: Cache Go dependencies
uses: actions/cache@v2
with:
path: go-build-cache
key: arm64_go_cache-${{ hashFiles('Dockerfile') }}
path: ~/go/pkg/mod
key: ${{ runner.os }}-go_mod-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go_mod
- name: inject go-build-cache into docker
# v1 was composed of two actions: "inject" and "extract".
# v2 is unified to a single action.
uses: reproducible-containers/[email protected]
- name: Cache Go build
uses: actions/cache@v2
with:
cache-map: |
"go-build-cache": "/tmp/.cache/go-build"
skip-extraction: ${{ steps.cache.outputs.cache-hit }}
path: ~/go/pkg/go-build
key: ${{ runner.os }}-go_build
restore-keys: |
${{ runner.os }}-go_build
- name: Build and push
uses: docker/build-push-action@v2
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG BUILDNUM=""
# Build Geth in a stock Go builder container
FROM golang:1.21-alpine as builder

RUN go env -w GOCACHE=/tmp/.cache/go-build
RUN go env -w GOCACHE=~/go/pkg/go-build

RUN apk add --no-cache gcc musl-dev linux-headers git

Expand All @@ -16,8 +16,7 @@ COPY go.sum /go-ethereum/
RUN cd /go-ethereum && go mod download

ADD . /go-ethereum
RUN --mount=type=cache,target=/tmp/.cache/go-build \
cd /go-ethereum && go run build/ci.go install -static ./cmd/geth
RUN cd /go-ethereum && go run build/ci.go install -static ./cmd/geth

# Pull Geth into a second stage deploy alpine container
FROM alpine:latest
Expand Down

0 comments on commit 3d36bc1

Please sign in to comment.