From ebe7c59d6056bffb25af832e64ae67fd461f3a32 Mon Sep 17 00:00:00 2001 From: "ian.nara" Date: Tue, 18 Jun 2024 10:32:00 -0600 Subject: [PATCH] use 22.04 during build --- .github/workflows/e2e-azure-cc-enclave.yaml | 117 ------------------- .github/workflows/e2e-gcp-oidc-enclave.yaml | 122 -------------------- Dockerfile.nitro.builder | 2 +- 3 files changed, 1 insertion(+), 240 deletions(-) delete mode 100644 .github/workflows/e2e-azure-cc-enclave.yaml delete mode 100644 .github/workflows/e2e-gcp-oidc-enclave.yaml diff --git a/.github/workflows/e2e-azure-cc-enclave.yaml b/.github/workflows/e2e-azure-cc-enclave.yaml deleted file mode 100644 index f7671ff92..000000000 --- a/.github/workflows/e2e-azure-cc-enclave.yaml +++ /dev/null @@ -1,117 +0,0 @@ -name: E2E AZURE CC Enclave -on: - workflow_dispatch: - inputs: - operator_image_version: - description: 'The version of Azure enclave image' - type: string - required: true - core_image_version: - description: 'The version of UID2 core image' - type: string - default: '2.15.0-50d596678a-default' - optout_image_version: - description: 'The version of UID2 optout image' - type: string - default: '2.6.18-60727cf243-default' - -env: - REGISTRY: ghcr.io - -jobs: - e2e-test: - runs-on: ubuntu-latest - permissions: - contents: write - packages: read - steps: - - name: Checkout full history - uses: actions/checkout@v4 - - - name: Checkout uid2-core repo - uses: actions/checkout@v4 - with: - repository: IABTechLab/uid2-core - token: ${{ secrets.GHCR_PAT }} - path: core - - - name: Checkout uid2-optout repo - uses: actions/checkout@v4 - with: - repository: IABTechLab/uid2-optout - token: ${{ secrets.GHCR_PAT }} - path: optout - - - name: Bring up ngrok - id: ngrok - env: - NGROK_TOKEN: ${{ secrets.NGROK_AUTHTOKEN }} - run: | - cd ./e2e && bash ./setup_ngrok.sh - - - name: Log in to the Docker container registry - uses: docker/login-action@v3 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - # we use personal access token here since we need to pull images from private repo (core) - password: ${{ secrets.GHCR_PAT }} - - - name: Prepare conf files - env: - CORE_ROOT: '../core' - OPTOUT_ROOT: '../optout' - run: | - cd ./e2e && bash ./prepare_conf.sh - - - name: Generate Azure enclave deployment artifacts - id: artifacts - env: - IMAGE_VERSION: ${{ inputs.operator_image_version }} - run: | - cd ./e2e && bash ./prepare_azure_cc_artifacts.sh - - - name: Prepare Azure enclave metadata - id: metadata - env: - OUTPUT_POLICY_DIGEST_FILE: ${{ steps.artifacts.outputs.OUTPUT_POLICY_DIGEST_FILE }} - run: | - cd ./e2e && bash ./prepare_azure_cc_enclave_metadata.sh - - - name: Bring up docker compose - id: docker_compose - env: - NGROK_URL_LOCALSTACK: ${{ steps.ngrok.outputs.NGROK_URL_LOCALSTACK }} - NGROK_URL_CORE: ${{ steps.ngrok.outputs.NGROK_URL_CORE }} - NGROK_URL_OPTOUT: ${{ steps.ngrok.outputs.NGROK_URL_OPTOUT }} - CORE_VERSION: ${{ inputs.core_image_version }} - OPTOUT_VERSION: ${{ inputs.optout_image_version }} - run: | - cd ./e2e && bash ./start_docker.sh - - - name: Azure Login - uses: azure/login@v2 - with: - creds: ${{ secrets.AZURE_CREDENTIALS }} - - - name: Start Azure private operator - id: start_azure - env: - NGROK_URL_CORE: ${{ steps.ngrok.outputs.NGROK_URL_CORE }} - NGROK_URL_OPTOUT: ${{ steps.ngrok.outputs.NGROK_URL_OPTOUT }} - OUTPUT_TEMPLATE_FILE: ${{ steps.artifacts.outputs.OUTPUT_TEMPLATE_FILE }} - OUTPUT_PARAMETERS_FILE: ${{ steps.artifacts.outputs.OUTPUT_PARAMETERS_FILE }} - run: | - cd ./e2e && bash ./start_azure_cc_enclave.sh - - - name: Stop Azure private operator - if: always() - env: - CONTAINER_GROUP_NAME: ${{ steps.start_azure.outputs.CONTAINER_GROUP_NAME }} - run: | - cd ./e2e && bash ./stop_azure_cc_enclave.sh - - - name: Stop ngrok - if: always() - run: | - killall ngrok diff --git a/.github/workflows/e2e-gcp-oidc-enclave.yaml b/.github/workflows/e2e-gcp-oidc-enclave.yaml deleted file mode 100644 index 9c415dcac..000000000 --- a/.github/workflows/e2e-gcp-oidc-enclave.yaml +++ /dev/null @@ -1,122 +0,0 @@ -name: E2E GCP OIDC Enclave -on: - workflow_dispatch: - inputs: - operator_image_hash: - description: 'The hash of GCP enclave image(start with sha256:)' - type: string - required: true - core_image_version: - description: 'The version of UID2 core image' - type: string - default: '2.15.0-50d596678a-default' - optout_image_version: - description: 'The version of UID2 optout image' - type: string - default: '2.6.18-60727cf243-default' - -env: - REGISTRY: ghcr.io - -jobs: - e2e-test: - runs-on: ubuntu-latest - permissions: - contents: write - packages: read - id-token: write - steps: - - name: Checkout full history - uses: actions/checkout@v4 - - - name: Checkout uid2-core repo - uses: actions/checkout@v4 - with: - repository: IABTechLab/uid2-core - token: ${{ secrets.GHCR_PAT }} - path: core - - - name: Checkout uid2-optout repo - uses: actions/checkout@v4 - with: - repository: IABTechLab/uid2-optout - token: ${{ secrets.GHCR_PAT }} - path: optout - - - name: Bring up ngrok - id: ngrok - env: - NGROK_TOKEN: ${{ secrets.NGROK_AUTHTOKEN }} - run: | - cd ./e2e && bash ./setup_ngrok.sh - - - name: Prepare GCP enclave metadata - id: metadata - env: - IMAGE_HASH: ${{ inputs.operator_image_hash }} - run: | - cd ./e2e && bash ./prepare_gcp_enclave_metadata.sh - - - name: Log in to the Docker container registry - uses: docker/login-action@v3 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - # we use personal access token here since we need to pull images from private repo (core) - password: ${{ secrets.GHCR_PAT }} - - - name: Prepare conf files - env: - CORE_ROOT: '../core' - OPTOUT_ROOT: '../optout' - run: | - cd ./e2e && bash ./prepare_conf.sh - - - name: Bring up docker compose - id: docker-compose - env: - NGROK_URL_LOCALSTACK: ${{ steps.ngrok.outputs.NGROK_URL_LOCALSTACK }} - NGROK_URL_CORE: ${{ steps.ngrok.outputs.NGROK_URL_CORE }} - NGROK_URL_OPTOUT: ${{ steps.ngrok.outputs.NGROK_URL_OPTOUT }} - CORE_VERSION: ${{ inputs.core_image_version }} - OPTOUT_VERSION: ${{ inputs.optout_image_version }} - run: | - cd ./e2e && bash ./start_docker.sh - - - name: Authenticate with Google Cloud - id: gcp_auth - uses: google-github-actions/auth@v0 - with: - token_format: access_token - workload_identity_provider: ${{ vars.GCP_WORKLOAD_IDENTITY_PROVIDER_ID }} - service_account: ${{ vars.GCP_SERVICE_ACCOUNT }} - access_token_lifetime: 1200s - - - name: Set up Cloud SDK - uses: 'google-github-actions/setup-gcloud@v1' - - - name: Start GCP private operator - id: start_gcp - env: - GCP_PROJECT: ${{ vars.GCP_PROJECT }} - SERVICE_ACCOUNT: ${{ vars.GCP_SERVICE_ACCOUNT }} - NGROK_URL_CORE: ${{ steps.ngrok.outputs.NGROK_URL_CORE }} - NGROK_URL_OPTOUT: ${{ steps.ngrok.outputs.NGROK_URL_OPTOUT }} - OPERATOR_KEY: ${{ steps.metadata.outputs.OPERATOR_KEY }} - IMAGE_HASH: ${{ inputs.operator_image_hash }} - run: | - cd ./e2e && bash ./start_gcp_enclave.sh - - - name: Stop GCP private operator - if: always() - env: - GCP_PROJECT: ${{ vars.GCP_PROJECT }} - SERVICE_ACCOUNT: ${{ vars.GCP_SERVICE_ACCOUNT }} - GCP_INSTANCE_NAME: ${{ steps.start_gcp.outputs.GCP_INSTANCE_NAME }} - run: | - cd ./e2e && bash ./stop_gcp_enclave.sh - - - name: Stop ngrok - if: always() - run: | - killall ngrok diff --git a/Dockerfile.nitro.builder b/Dockerfile.nitro.builder index d79c26077..23aaba22b 100644 --- a/Dockerfile.nitro.builder +++ b/Dockerfile.nitro.builder @@ -1,4 +1,4 @@ -FROM ubuntu:24.04 +FROM ubuntu:22.04 ENV enclave_platform="aws-nitro"