Skip to content

Commit 22fe0e3

Browse files
authored
revert(docker-build): cache docker builds (#64)
Refs: 7f4860d
1 parent 7a2defc commit 22fe0e3

File tree

2 files changed

+10
-66
lines changed

2 files changed

+10
-66
lines changed

Diff for: .github/workflows/docker-build-push-multi-platform.yml

+5-33
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ on:
3838
required: false
3939
type: boolean
4040
default: false
41-
build-cache:
42-
description: >-
43-
Use cache when building the image.
44-
required: false
45-
type: boolean
46-
default: true
4741
build-cache-key:
4842
description: >-
4943
An explicit key for a cache entry.
@@ -96,45 +90,23 @@ jobs:
9690
username: ${{ inputs.registry-username }}
9791
password: ${{ secrets.registry-password }}
9892

99-
- name: Build and push by digest (cached)
100-
if: ${{ inputs.build-cache }}
101-
id: build-cache
93+
- name: Build and push by digest
94+
id: build
10295
uses: docker/build-push-action@v6
10396
with:
10497
cache-from: type=gha,scope=${{ inputs.build-cache-key }}-${{ env.PLATFORM_PAIR }}
105-
cache-to: type=gha,scope=${{ inputs.build-cache-key }}-${{ env.PLATFORM_PAIR }},mode=min
106-
context: ${{ inputs.build-context }}
107-
file: ${{ inputs.build-file }}
108-
labels: ${{ steps.meta.outputs.labels }}
109-
outputs: type=image,name=${{ inputs.registry-image }},push-by-digest=true,name-canonical=true,push=true
110-
platforms: ${{ matrix.builder.platform }}
111-
provenance: ${{ inputs.build-provenance }}
112-
113-
- name: Export digest (cached)
114-
if: ${{ inputs.build-cache }}
115-
run: |
116-
mkdir -p ${{ runner.temp }}/digests
117-
digest="${{ steps.build-cache.outputs.digest }}"
118-
touch "${{ runner.temp }}/digests/${digest#sha256:}"
119-
120-
- name: Build and push by digest (no cache)
121-
if: ${{ ! inputs.build-cache }}
122-
id: build-no-cache
123-
uses: docker/build-push-action@v6
124-
with:
98+
cache-to: type=gha,scope=${{ inputs.build-cache-key }}-${{ env.PLATFORM_PAIR }},mode=max
12599
context: ${{ inputs.build-context }}
126100
file: ${{ inputs.build-file }}
127101
labels: ${{ steps.meta.outputs.labels }}
128-
no-cache: ${{ ! inputs.build-cache }}
129102
outputs: type=image,name=${{ inputs.registry-image }},push-by-digest=true,name-canonical=true,push=true
130103
platforms: ${{ matrix.builder.platform }}
131104
provenance: ${{ inputs.build-provenance }}
132105

133-
- name: Export digest (no cache)
134-
if: ${{ ! inputs.build-cache }}
106+
- name: Export digest
135107
run: |
136108
mkdir -p ${{ runner.temp }}/digests
137-
digest="${{ steps.build-no-cache.outputs.digest }}"
109+
digest="${{ steps.build.outputs.digest }}"
138110
touch "${{ runner.temp }}/digests/${digest#sha256:}"
139111
140112
- name: Upload digest

Diff for: .github/workflows/docker-build-push-multi-registry.yml

+5-33
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ on:
3131
Path to the Dockerfile.
3232
type: string
3333
required: false
34-
build-cache:
35-
description: >-
36-
Use cache when building the image.
37-
required: false
38-
type: boolean
39-
default: true
4034
build-cache-key:
4135
description: >-
4236
An explicit key for a cache entry.
@@ -111,45 +105,23 @@ jobs:
111105
- name: Set up Docker Buildx
112106
uses: docker/setup-buildx-action@v3
113107

114-
- name: Build and push by digest (cached)
115-
if: ${{ inputs.build-cache }}
116-
id: build-cache
108+
- name: Build and push by digest
109+
id: build
117110
uses: docker/build-push-action@v6
118111
with:
119112
cache-from: type=gha,scope=${{ inputs.build-cache-key }}-${{ env.PLATFORM_PAIR }}
120-
cache-to: type=gha,scope=${{ inputs.build-cache-key }}-${{ env.PLATFORM_PAIR }},mode=min
121-
context: ${{ inputs.build-context }}
122-
file: ${{ inputs.build-file }}
123-
labels: ${{ steps.meta.outputs.labels }}
124-
outputs: type=image,"name=${{ inputs.dockerhub-repo }},${{ inputs.quay-repo }}",push-by-digest=true,name-canonical=true,push=true
125-
platforms: ${{ matrix.builder.platform }}
126-
provenance: false
127-
128-
- name: Export digest (cached)
129-
if: ${{ inputs.build-cache }}
130-
run: |
131-
mkdir -p ${{ runner.temp }}/digests
132-
digest="${{ steps.build-cache.outputs.digest }}"
133-
touch "${{ runner.temp }}/digests/${digest#sha256:}"
134-
135-
- name: Build and push by digest (no cache)
136-
if: ${{ ! inputs.build-cache }}
137-
id: build-no-cache
138-
uses: docker/build-push-action@v6
139-
with:
113+
cache-to: type=gha,scope=${{ inputs.build-cache-key }}-${{ env.PLATFORM_PAIR }},mode=max
140114
context: ${{ inputs.build-context }}
141115
file: ${{ inputs.build-file }}
142116
labels: ${{ steps.meta.outputs.labels }}
143-
no-cache: ${{ ! inputs.build-cache }}
144117
outputs: type=image,"name=${{ inputs.dockerhub-repo }},${{ inputs.quay-repo }}",push-by-digest=true,name-canonical=true,push=true
145118
platforms: ${{ matrix.builder.platform }}
146119
provenance: false
147120

148-
- name: Export digest (no cache)
149-
if: ${{ ! inputs.build-cache }}
121+
- name: Export digest
150122
run: |
151123
mkdir -p ${{ runner.temp }}/digests
152-
digest="${{ steps.build-no-cache.outputs.digest }}"
124+
digest="${{ steps.build.outputs.digest }}"
153125
touch "${{ runner.temp }}/digests/${digest#sha256:}"
154126
155127
- name: Upload digest

0 commit comments

Comments
 (0)