chore: attempt different gpg keyserver

pcnc · darora · commit e220a5d6a95a · 2023-09-26T04:52:08.000+08:00
diff --git a/.github/workflows/collect-u18-binaries.yml b/.github/workflows/collect-u18-binaries.yml
@@ -6,7 +6,7 @@ on:
       - develop
       - pcnc/pg-upgrade-fixes
     paths:
-      - '.github/workflows/ami-build-ubuntu-18.yml'
+      - '.github/workflows/collect-u18-binaries.yml'
       - 'common.vars.pkr.hcl'
       
   workflow_run:
@@ -137,25 +137,3 @@ jobs:
       - name: Upload pg binaries to s3 prod
         run: |
           aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/18.04.tar.gz
-
-      - name: Deregister image
-        if: ${{ always() }}
-        continue-on-error: true
-        run: |
-          IMAGE_IDS=$(aws ec2 describe-images --filters "Name=name,Values=builder-supabase-postgres-u18-*" --query "Images[] .ImageId" --output text)
-          for IMAGE_ID in $IMAGE_IDS; do
-            SNAPSHOTS=$(aws ec2 describe-images --image-ids $IMAGE_ID --query "Images[*].BlockDeviceMappings[*].Ebs.SnapshotId" --output text)
-
-            echo "Deregistering image $IMAGE_ID"
-            aws ec2 deregister-image --image-id $IMAGE_ID
-
-            for SNAPSHOT in $SNAPSHOTS; do
-              echo "Deleting snapshot $SNAPSHOT"
-              aws ec2 delete-snapshot --snapshot-id $SNAPSHOT
-            done
-          done
-
-      - name: Cleanup resources on build cancellation
-        if: ${{ cancelled() }}
-        run: |
-          aws ec2 describe-instances --filters "Name=tag:packerExecutionId,Values=u18-${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -I {} aws ec2 terminate-instances --instance-ids {}
diff --git a/Dockerfile-u18 b/Dockerfile-u18
@@ -133,7 +133,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # Add Postgres PPA
 ARG postgresql_gpg_key=B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
 RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
-    gpg --recv-keys --no-default-keyring --keyring /tmp/pgdg.key --keyserver pgp.mit.edu --recv-keys "${postgresql_gpg_key}" && \
+    gpg --recv-keys --no-default-keyring --keyring /tmp/pgdg.key --keyserver keyserver.ubuntu.com --recv-keys "${postgresql_gpg_key}" && \
     gpg --no-default-keyring --keyring /tmp/pgdg.key --export "${postgresql_gpg_key}" > /etc/apt/trusted.gpg.d/pgdg.gpg && \
     echo "deb https://apt-archive.postgresql.org/pub/repos/apt bionic-pgdg-archive main" > /etc/apt/sources.list.d/pgdg.list
 
