From 736faaeff2fd0c77a4dacc0721448ea646acbba3 Mon Sep 17 00:00:00 2001 From: Thomas Manson Date: Tue, 19 Nov 2024 13:00:24 +1100 Subject: [PATCH] Change path to zip file --- .github/actions/build_aws_eif/action.yaml | 1 + .github/workflows/publish-aws-nitro-eif.yaml | 4 ++-- scripts/aws/pipeline/amazonlinux2023.Dockerfile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/actions/build_aws_eif/action.yaml b/.github/actions/build_aws_eif/action.yaml index f17523a44..d90883428 100644 --- a/.github/actions/build_aws_eif/action.yaml +++ b/.github/actions/build_aws_eif/action.yaml @@ -49,6 +49,7 @@ runs: shell: bash run: | df -h + ls -la - name: Run amazonlinux Docker image shell: bash diff --git a/.github/workflows/publish-aws-nitro-eif.yaml b/.github/workflows/publish-aws-nitro-eif.yaml index 8783f6829..a4b2c5ab0 100644 --- a/.github/workflows/publish-aws-nitro-eif.yaml +++ b/.github/workflows/publish-aws-nitro-eif.yaml @@ -70,7 +70,7 @@ jobs: steps: - name: Build UID2 AWS EIF id: build_uid2_eif - uses: IABTechLab/uid2-operator/.github/actions/build_aws_eif@main + uses: IABTechLab/uid2-operator/.github/actions/build_aws_eif@tjm-test-aws-custom-eif with: identity_scope: uid2 artifacts_base_output_dir: ${{ env.ARTIFACTS_BASE_OUTPUT_DIR }}/uid2 @@ -106,7 +106,7 @@ jobs: steps: - name: Build EUID AWS EIF id: build_euid_eif - uses: IABTechLab/uid2-operator/.github/actions/build_aws_eif@main + uses: IABTechLab/uid2-operator/.github/actions/build_aws_eif@tjm-test-aws-custom-eif with: identity_scope: euid artifacts_base_output_dir: ${{ env.ARTIFACTS_BASE_OUTPUT_DIR }}/euid diff --git a/scripts/aws/pipeline/amazonlinux2023.Dockerfile b/scripts/aws/pipeline/amazonlinux2023.Dockerfile index caa9133b5..86e31822a 100644 --- a/scripts/aws/pipeline/amazonlinux2023.Dockerfile +++ b/scripts/aws/pipeline/amazonlinux2023.Dockerfile @@ -8,7 +8,7 @@ RUN dnf -y groupinstall "Development Tools" \ && dnf -y install systemd vim-common wget git tar libstdc++-static.x86_64 cmake cmake3 aws-cli \ && dnf clean all -COPY ./scripts/aws/pipeline/enclave-cli-1.5.3rc /tmp/enclave-cli-1.5.3rc +COPY enclave-cli-1.5.3rc.zip /tmp/enclave-cli-1.5.3rc.zip RUN unzip /tmp/enclave-cli-1.5.3rc.zip -d /tmp/ && dnf install -y /tmp/*.rpm # RUN aws s3 cp s3://troubleshoot-delete-uid2-aws/enclave-cli-1.5.3rc.zip /tmp/ && unzip /tmp/enclave-cli-1.5.3rc.zip -d /tmp/ && dnf install -y /tmp/*.rpm