Skip to content

Commit 4fc4b74

Browse files
committed
fix it
1 parent 0877192 commit 4fc4b74

5 files changed

Lines changed: 6 additions & 20 deletions

File tree

.github/workflows/build_all_images.yml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ name: build_all_images
1111
NO_CACHE:
1212
required: true
1313
type: boolean
14-
pinned_image:
15-
type: string
16-
required: true
1714
permissions: {}
1815
jobs:
1916
discover_folders:
@@ -39,40 +36,33 @@ jobs:
3936
} >> "$GITHUB_OUTPUT"
4037
4138
build_tool_images:
39+
# build common tool images with a lower scoped github token as it uses a 3rd party docker image with github cli installed to verify attestation of tflint binary.
40+
# token needs attestation read so it can verify attestation of tflint binary
4241
runs-on: ubuntu-22.04
43-
container:
44-
image: ${{ inputs.pinned_image }}
45-
options: --user 1001:1001 --group-add 128
46-
defaults:
47-
run:
48-
shell: bash
4942
permissions:
5043
contents: read
5144
attestations: read
5245
steps:
53-
- name: copy .tool-versions
54-
run: |
55-
cp /home/vscode/.tool-versions "$HOME/.tool-versions"
5646
- name: Checkout code
5747
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
5848
with:
5949
fetch-depth: 0
6050
persist-credentials: false
6151
- name: build_grype
62-
run:
52+
run: |
6353
make build-grype
6454
docker save "local_grype:latest" -o grype_image.tar
6555
- name: build_syft
66-
run:
56+
run: |
6757
make build-syft
6858
docker save "local_syft:latest" -o syft_image.tar
6959
- name: build_grant
70-
run:
60+
run: |
7161
make build-grant
7262
docker save "local_grant:latest" -o grant_image.tar
7363
7464
- name: build_tflint
75-
run:
65+
run: |
7666
make build-tflint
7767
docker save "local_tflint:latest" -o tflint_image.tar
7868

.github/workflows/build_multi_arch_image.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ jobs:
176176
BASE_FOLDER: "${{ inputs.base_folder }}"
177177
NO_CACHE: '${{ inputs.NO_CACHE }}'
178178
BUILDX_NO_DEFAULT_ATTESTATIONS: "1"
179-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
180179
- name: Check docker vulnerabilities - json output
181180
run: |
182181
make scan-image-json

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,3 @@ jobs:
5050
docker_tag: 'ci-${{ needs.tag_release.outputs.version_tag }}'
5151
tag_latest: false
5252
NO_CACHE: false
53-
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

.github/workflows/pull_request.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,3 @@ jobs:
9595
docker_tag: 'pr-${{ needs.get_issue_number.outputs.issue_number }}-${{ needs.get_commit_id.outputs.sha_short }}'
9696
tag_latest: false
9797
NO_CACHE: false
98-
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

.github/workflows/release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,3 @@ jobs:
5353
docker_tag: '${{ needs.tag_release.outputs.version_tag }}'
5454
tag_latest: true
5555
NO_CACHE: false
56-
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

0 commit comments

Comments
 (0)