Skip to content

Commit 320eae6

Browse files
authored
fix: Remove buildx cache option from bake commands (#28)
* monitor free memory during the Great British Bake Off ![Richmond](https://static.wikia.nocookie.net/theitcrowd/images/a/a1/Richmond1%29.jpg/revision/latest?cb=20100424103252) * drop bake cache option * fix(build-product-image): Remove buildx cache option for bake * fix(build-container-image): Remove comments about buildx cache option for bake
1 parent a177bbb commit 320eae6

File tree

5 files changed

+1
-40
lines changed

5 files changed

+1
-40
lines changed

.github/workflows/pr_actions-smoke-test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ jobs:
5858
with:
5959
product-name: smoke
6060
product-version: ${{ matrix.versions }}
61-
build-cache-password: ${{ secrets.BUILD_CACHE_NEXUS_PASSWORD }}
6261
bake-config-file: smoke/conf.py
6362
extra-tag-data: pr-321
6463

build-container-image/README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ All subsequent tasks must use this value to ensure consistency.
2121
- `image-index-manifest-tag` (eg: `3.4.1-stackable0.0.0-dev`)
2222
- `container-file` (defaults to `Dockerfile`)
2323
- `build-context` (defaults to `.`)
24-
<!--
25-
TODO (@NickLarsenNZ): Allow optional buildx cache
26-
- `build-cache-username`
27-
- `build-cache-password`
28-
-->
2924

3025
### Outputs
3126

build-container-image/action.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ inputs:
1717
build-context:
1818
description: Path to the build-context
1919
default: .
20-
# TODO (@NickLarsenNZ): Allow optional buildx cache
21-
# build-cache-username:
22-
# description: Build cache username
23-
# default: github
24-
# build-cache-password:
25-
# description: Build cache password
26-
# required: true
2720
outputs:
2821
image-repository-uri:
2922
description: |
@@ -45,15 +38,6 @@ runs:
4538
- name: Setup Docker Buildx
4639
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
4740

48-
# TODO (@NickLarsenNZ): Allow optional buildx cache
49-
# # Needed if you pass the --cache argument to the bake command below
50-
# - name: Login to the docker build cache registry
51-
# uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
52-
# with:
53-
# registry: build-repo.stackable.tech:8083
54-
# username: ${{ inputs.build-cache-username }}
55-
# password: ${{ inputs.build-cache-password }}
56-
5741
- name: Build ${{ inputs.image-name }}:${{ inputs.image-index-manifest-tag }}
5842
id: build-image
5943
env:

build-product-image/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ localhost/kafka:3.4.1-stackable0.0.0-dev-amd64
4444
- `product-name` (eg: `kafka`)
4545
- `product-version` (eg: `3.4.1`)
4646
- `image-tools-version` (eg: `0.0.13`)
47-
- `build-cache-username` (required) <!-- TODO: make the cache optional -->
48-
- `build-cache-password` (required) <!-- TODO: make the cache optional -->
4947
- `bake-config-file` (defaults to `./conf.py`)
5048
- `sdp-version` (defaults to: `0.0.0-dev`)
5149
- `extra-tag-data` (optional, eg. `pr321`)

build-product-image/action.yml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ inputs:
1111
image-tools-version:
1212
description: The Stackable image-tools version
1313
default: 0.0.13
14-
build-cache-username:
15-
description: Build cache username
16-
default: github
17-
build-cache-password:
18-
description: Build cache password
19-
required: true
2014
bake-config-file:
2115
description: Path to the bake config file, defaults to `./conf.py`
2216
default: ./conf.py
@@ -56,14 +50,6 @@ runs:
5650
shell: bash
5751
run: pip install image-tools-stackabletech==${{ inputs.image-tools-version }}
5852

59-
# Needed if you pass the --cache argument to the bake command below
60-
- name: Login to the docker build cache registry
61-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
62-
with:
63-
registry: build-repo.stackable.tech:8083
64-
username: ${{ inputs.build-cache-username }}
65-
password: ${{ inputs.build-cache-password }}
66-
6753
- name: Building ${{ inputs.product-name }} Container Image using bake
6854
env:
6955
BAKE_PRODUCT_VERSION: ${{ inputs.product-version }}
@@ -95,8 +81,7 @@ runs:
9581
--image-version "$IMAGE_INDEX_MANIFEST_TAG" \
9682
--architecture "linux/${IMAGE_ARCH}" \
9783
--export-tags-file bake-target-tags \
98-
--configuration "$BAKE_CONFIG_FILE" \
99-
--cache
84+
--configuration "$BAKE_CONFIG_FILE"
10085
echo "::endgroup::"
10186
10287
- name: Re-tag Image (Temporary)

0 commit comments

Comments
 (0)