Skip to content

Commit d4875dd

Browse files
committed
Update workflows to use BUILD_PLATFORMS variable and include AWS_ROLE_ARN in secrets
1 parent efbc2f6 commit d4875dd

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

.github/workflows/build-dev-image.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ jobs:
2929
uses: reportportal/.github/.github/workflows/build-docker-image.yaml@main
3030
with:
3131
aws-region: ${{ vars.AWS_REGION }}
32-
aws-role-arn: ${{ vars.AWS_ROLE_ARN }}
32+
build-platforms: ${{ vars.BUILD_PLATFORMS || 'linux/amd64,linux/arm64' }}
3333
image-tag: 'develop-${{ github.run_number }}'
3434
additional-tag: 'develop-latest'
3535
version: 'develop-${{ github.run_number }}'
3636
date: ${{ needs.variables-setup.outputs.date }}
37+
secrets:
38+
AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}

.github/workflows/build-feature-image.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ jobs:
3636
uses: reportportal/.github/.github/workflows/build-docker-image.yaml@main
3737
with:
3838
aws-region: ${{ vars.AWS_REGION }}
39-
aws-role-arn: ${{ vars.AWS_ROLE_ARN }}
39+
build-platforms: ${{ vars.BUILD_PLATFORMS || 'linux/amd64,linux/arm64' }}
4040
image-tag: ${{ needs.variables-setup.outputs.tag }}
4141
version: ${{ needs.variables-setup.outputs.tag }}
4242
branch: ${{ github.head_ref }}
4343
date: ${{ needs.variables-setup.outputs.date }}
44+
secrets:
45+
AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
4446

.github/workflows/build-rc-image.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ jobs:
1818
- name: Create variables
1919
id: vars
2020
run: |
21-
echo "platforms=${{ vars.BUILD_PLATFORMS }}" >> $GITHUB_OUTPUT
2221
echo "version=$(echo '${{ github.ref_name }}' | sed -nE 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p')" >> $GITHUB_OUTPUT
2322
echo "tag=$(echo ${{ github.ref_name }}-${{ github.run_number }} | tr '/' '-')" >> $GITHUB_OUTPUT
2423
echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
2524
outputs:
26-
platforms: ${{ steps.vars.outputs.platforms }}
2725
version: ${{ steps.vars.outputs.version }}
2826
tag: ${{ steps.vars.outputs.tag }}
2927
date: ${{ steps.vars.outputs.date }}
@@ -34,10 +32,11 @@ jobs:
3432
uses: reportportal/.github/.github/workflows/build-docker-image.yaml@main
3533
with:
3634
aws-region: ${{ vars.AWS_REGION }}
37-
aws-role-arn: ${{ vars.AWS_ROLE_ARN }}
35+
build-platforms: ${{ vars.BUILD_PLATFORMS || 'linux/amd64,linux/arm64' }}
3836
image-tag: ${{ needs.variables-setup.outputs.tag }}
3937
additional-tag: 'latest'
40-
build-platforms: ${{ needs.variables-setup.outputs.platforms }}
4138
version: ${{ needs.variables-setup.outputs.version }}
4239
date: ${{ needs.variables-setup.outputs.date }}
4340
scan-image: true
41+
secrets:
42+
AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}

.github/workflows/dockerhub-release.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ jobs:
99
if: >
1010
github.event.review.state == 'approved'
1111
# TODO: Pin reusable workflow to a version tag once v1 is released
12-
uses: reportportal/.github/.github/workflows/dockerhub-release.yaml@0cfc683f89cee91ccc24f05c728b00f23027e7f2
12+
uses: reportportal/.github/.github/workflows/dockerhub-release.yaml@main
1313
secrets:
14-
REGESTRY_USERNAME: ${{ secrets.REGESTRY_USERNAME }}
15-
REGESTRY_PASSWORD: ${{ secrets.REGESTRY_PASSWORD }}
14+
AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
15+
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
16+
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
1617
with:
1718
aws-region: ${{ vars.AWS_REGION }}
18-
aws-role-arn: ${{ vars.AWS_ROLE_ARN }}
19-
ecr-repository: service-index
20-
target-registry: docker.io
21-
target-repository: reportportal/service-index
22-
platforms: linux/amd64
19+
ecr-repository: ${{ vars.ECR_REPOSITORY || 'service-index' }}
20+
target-registry: ${{ vars.TARGET_REGISTRY || 'docker.io' }}
21+
target-repository: ${{ vars.TARGET_REPOSITORY || 'reportportal/service-index' }}
22+
platforms: ${{ vars.BUILD_PLATFORMS || 'linux/amd64,linux/arm64' }}
2323
release-mode: rc

0 commit comments

Comments
 (0)