Skip to content

Commit 875ba04

Browse files
committed
[ci] add FIPS image build - fix 2
1 parent 6e89775 commit 875ba04

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/ci-docker-build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,16 @@ jobs:
7878
uses: docker/metadata-action@v5
7979
with:
8080
images: ${{ inputs.registry }}/platform
81-
tags: type=raw,value=${{ inputs.image_tag }}${{ inputs.fips && '-fips' }}
81+
tags: type=raw,value=${{ inputs.image_tag }${{ inputs.is_fips == 'true' && '-fips' }}
8282

83-
- name: Build and ${{ inputs.is_publish_to_registry && 'push' || 'export as tar' }}
83+
- name: Build and ${{ inputs.is_publish_to_registry == 'true' && 'push' || ' export as tar' }}${{ inputs.is_fips == 'true' && ' FIPS' }}
8484
uses: docker/build-push-action@v6
8585
with:
8686
context: opencti-platform
8787
file: opencti-platform/Dockerfile_featurebranch
8888
target: ${{ inputs.dockerfile_target }}
8989
build-args: |
90-
"BASE_TYPE=${{ inputs.fips && 'fips' || 'alpine' }}"
90+
"BASE_TYPE=${{ inputs.is_fips == 'true' && 'fips' || 'alpine' }}"
9191
push: ${{ inputs.is_publish_to_registry == 'true' }}
9292
outputs: ${{ inputs.is_publish_to_registry == 'false' && 'type=docker,dest=/tmp/opencti-platform.tar' }}
9393
tags: ${{ steps.meta.outputs.tags }}
@@ -134,15 +134,15 @@ jobs:
134134
uses: docker/metadata-action@v5
135135
with:
136136
images: ${{ inputs.registry }}/worker
137-
tags: type=raw,value=${{ inputs.image_tag }}${{ inputs.fips && '-fips' }}
138-
139-
- name: Build and ${{ inputs.is_publish_to_registry && 'push' || 'export as tar' }}
137+
tags: type=raw,value=${{ inputs.image_tag }}${{ inputs.is_fips == 'true' && '-fips' }}
138+
139+
- name: Build and ${{ inputs.is_publish_to_registry == 'true' && 'push' || ' export as tar' }}${{ inputs.is_fips == 'true' && ' FIPS' }}
140140
uses: docker/build-push-action@v6
141141
with:
142142
context: opencti-worker
143143
file: opencti-worker/Dockerfile
144144
build-args: |
145-
"BASE_TYPE=${{ inputs.fips && 'fips' || 'alpine' }}"
145+
"BASE_TYPE=${{ inputs.is_fips == 'true' && 'fips' || 'alpine' }}"
146146
push: ${{ inputs.is_publish_to_registry == 'true' }}
147147
outputs: ${{ inputs.is_publish_to_registry == 'false' && 'type=docker,dest=/tmp/opencti-worker.tar' }}
148148
tags: ${{ steps.meta.outputs.tags }}

0 commit comments

Comments
 (0)