Skip to content

Commit b570cc7

Browse files
committed
Pass as build arg
1 parent d2d124c commit b570cc7

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

.github/workflows/graviton-build-test-push-workflow-AL2023.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ jobs:
9797
export BUILDPLATFORM=linux/arm64
9898
export TARGETOS=linux
9999
export TARGETARCH=arm64
100-
export BASE_OS=public.ecr.aws/amazonlinux/amazonlinux:2023
101-
docker buildx build --push --platform=linux/arm64,linux/amd64 --tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA -f Dockerfile.graviton .
100+
docker buildx build --push --platform=linux/arm64,linux/amd64 --build-arg BASE_OS=public.ecr.aws/amazonlinux/amazonlinux:2023 --tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA -f Dockerfile.graviton .
102101
- name: Sign Splunk Operator image with a key
103102
run: |
104103
cosign sign --yes --key env://COSIGN_PRIVATE_KEY ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ github.sha }}
@@ -159,6 +158,7 @@ jobs:
159158
# sarif_file: 'trivy-results.sarif'
160159
smoke-tests-graviton:
161160
#needs: vulnerability-scan
161+
needs: build-operator-image-graviton
162162
strategy:
163163
fail-fast: false
164164
matrix:

.github/workflows/graviton-build-test-push-workflow-Ubuntu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ jobs:
9797
export BUILDPLATFORM=linux/arm64
9898
export TARGETOS=linux
9999
export TARGETARCH=arm64
100-
export BASE_OS=ubuntu:24.10
101-
docker buildx build --push --platform=linux/arm64,linux/amd64 --tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA -f Dockerfile.graviton .
100+
docker buildx build --push --platform=linux/arm64,linux/amd64 --build-arg BASE_OS=ubuntu:24.10 --tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA -f Dockerfile.graviton .
102101
- name: Sign Splunk Operator image with a key
103102
run: |
104103
cosign sign --yes --key env://COSIGN_PRIVATE_KEY ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ github.sha }}
@@ -159,6 +158,7 @@ jobs:
159158
# sarif_file: 'trivy-results.sarif'
160159
smoke-tests-graviton:
161160
#needs: vulnerability-scan
161+
needs: build-operator-image-graviton
162162
strategy:
163163
fail-fast: false
164164
matrix:

.github/workflows/graviton-int-test-workflow-AL2023.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ jobs:
4646
export BUILDPLATFORM=linux/arm64
4747
export TARGETOS=linux
4848
export TARGETARCH=arm64
49-
export BASE_OS=public.ecr.aws/amazonlinux/amazonlinux:2023
50-
docker buildx build --push --platform=linux/arm64,linux/amd64 --tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA -f Dockerfile.graviton .
49+
docker buildx build --push --platform=linux/arm64,linux/amd64 --build-arg BASE_OS=public.ecr.aws/amazonlinux/amazonlinux:2023 --tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA -f Dockerfile.graviton .
5150
int-tests-graviton:
5251
strategy:
5352
fail-fast: false

.github/workflows/graviton-int-test-workflow-Ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
export TARGETOS=linux
4848
export TARGETARCH=arm64
4949
export BASE_OS=ubuntu:24.10
50-
docker buildx build --push --platform=linux/arm64,linux/amd64 --tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA -f Dockerfile.graviton .
50+
docker buildx build --push --platform=linux/arm64,linux/amd64 --build-arg BASE_OS=ubuntu:24.10 --tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA -f Dockerfile.graviton .
5151
int-tests-graviton:
5252
strategy:
5353
fail-fast: false

0 commit comments

Comments
 (0)