diff --git a/.github/workflows/build-courier-push-tag-shared.yaml b/.github/workflows/build-courier-push-tag-shared.yaml index be018384a..e2099b708 100644 --- a/.github/workflows/build-courier-push-tag-shared.yaml +++ b/.github/workflows/build-courier-push-tag-shared.yaml @@ -55,17 +55,6 @@ jobs: username: ${{ secrets.AWS_ACCESS_KEY_ID_SHARED }} password: ${{ secrets.AWS_SECRET_ACCESS_KEY_SHARED }} - - name: Go Build Cache for Docker - uses: actions/cache@v3 - with: - path: go-build-cache - key: ${{ runner.os }}-go-build-cache-${{ hashFiles('**/go.sum') }} - - - name: inject go-build-cache into docker - uses: reproducible-containers/buildkit-cache-dance@v2.1.2 - with: - cache-source: go-build-cache - - name: Build and push - Courier Image uses: docker/build-push-action@v3 with: @@ -77,8 +66,7 @@ jobs: file: docker/Dockerfile push: true tags: "${{env.IMAGE_TAG}}" - cache-from: type=gha - cache-to: type=gha,mode=max + no-cache: true - name: Check out Kubernetes Manifests uses: actions/checkout@master @@ -142,3 +130,4 @@ jobs: directory: ./kubernetes-manifests/ branch: main message: "From Courier Build (Push Tag ${{ env.MANIFESTS_ENVIRONMENT }})" + diff --git a/docker/Dockerfile b/docker/Dockerfile index a7007aeb3..d204ca87b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,15 +2,13 @@ FROM golang:1.17.5-alpine3.14 AS builder WORKDIR /app -RUN go env -w GOMODCACHE=/root/.cache/go-build - RUN apk add --no-cache --virtual build-deps curl gcc COPY go.mod go.sum ./ -RUN --mount=type=cache,target=/root/.cache/go-build go mod download +RUN --mount=type=cache,target=/go/pkg/mod/ go mod download COPY . ./ -RUN --mount=type=cache,target=/root/.cache/go-build go install -v ./cmd/... +RUN --mount=type=cache,target=/go/pkg/mod/ go install -v ./cmd/... FROM alpine:3.18.4