chore: 1 deploy_dockerhub CI task (#2670)

Addresses Phil's [feedback](#2492 (comment)) on already merged PR.
AztecProtocol · Oct 5, 2023 · ddc154a · ddc154a
1 parent b458670
commit ddc154a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 30 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1032,35 +1032,16 @@ jobs:
           name: "yarn-project"
           command: yarn-project/deploy_npm.sh
 
-  deploy-dockerhub-sandbox:
+  deploy-dockerhub:
     machine:
       image: ubuntu-2204:2023.07.2
     resource_class: medium
     steps:
       - *checkout
       - *setup_env
       - run:
-          name: "deploy-sandbox"
-          working_directory: aztec-sandbox
-          command: |
-            deploy_dockerhub aztec-sandbox x86_64
-            deploy_dockerhub aztec-sandbox arm64
-            create_dockerhub_manifest aztec-sandbox x86_64,arm64
-
-  deploy-dockerhub-pxe:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: medium
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "deploy-pxe"
-          working_directory: pxe
-          command: |
-            deploy_dockerhub pxe x86_64
-            deploy_dockerhub pxe arm64
-            create_dockerhub_manifest pxe x86_64,arm64
+          name: "Deploy to dockerhub"
+          command: yarn-project/deploy_dockerhub.sh
 
   deploy-end:
     docker:
@@ -1388,11 +1369,7 @@ workflows:
           <<: *defaults
 
         # Deployment and Canary tests
-      - deploy-dockerhub-sandbox:
-          requires:
-            - e2e-end
-          <<: *deploy_defaults
-      - deploy-dockerhub-pxe:
+      - deploy-dockerhub:
           requires:
             - e2e-end
           <<: *deploy_defaults
@@ -1403,8 +1380,7 @@ workflows:
 
       - deploy-end:
           requires:
-            - deploy-dockerhub-sandbox
-            - deploy-dockerhub-pxe
+            - deploy-dockerhub
             - deploy-npm
           <<: *deploy_defaults
 

diff --git a/yarn-project/deploy_dockerhub.sh b/yarn-project/deploy_dockerhub.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+extract_repo yarn-project /usr/src project
+PROJECT_ROOT=$(pwd)/project/src/
+
+for REPOSITORY in "pxe" "aztec-sandbox"
+do
+    echo "Deploying $REPOSITORY"
+    RELATIVE_PROJECT_DIR=$(query_manifest relativeProjectDir $REPOSITORY)
+    cd "$PROJECT_ROOT/$RELATIVE_PROJECT_DIR"
+
+    deploy_dockerhub $REPOSITORY x86_64
+    deploy_dockerhub $REPOSITORY arm64
+    create_dockerhub_manifest $REPOSITORY x86_64,arm64
+done
diff --git a/yarn-project/pxe/src/bin/index.ts b/yarn-project/pxe/src/bin/index.ts
@@ -6,7 +6,7 @@ import { getPXEServiceConfig } from '../config/index.js';
 import { startPXEHttpServer } from '../pxe_http/index.js';
 import { createPXEService } from '../pxe_service/index.js';
 
-const { PXE_PORT = 8081, AZTEC_NODE_URL = 'http://localhost:8079' } = process.env;
+const { PXE_PORT = 8080, AZTEC_NODE_URL = 'http://localhost:8079' } = process.env;
 
 const logger = createDebugLogger('aztec:pxe_service');