chore: remove pxe / node /p2p-bootstrap docker images (#3396)

Closes #3394 # Checklist: Remove the checklist to signal you've completed it. Enable auto-merge if the PR is ready to merge. - [ ] If the pull request requires a cryptography review (e.g. cryptographic algorithm implementations) I have added the 'crypto' tag. - [ ] I have reviewed my diff in github, line by line and removed unexpected formatting changes, testing logs, or commented-out code. - [ ] Every change is related to the PR description. - [ ] I have [linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) this pull request to relevant issues (if any exist).
AztecProtocol · Nov 22, 2023 · c236143 · c236143
1 parent a73c4aa
commit c236143
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 203 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -424,28 +424,6 @@ jobs:
             echo "export DOCKER_BUILDKIT=" > $BASH_ENV
             build cli false arm64
 
-  aztec-p2p-bootstrap:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build and test"
-          command: build p2p-bootstrap | add_timestamps
-
-  aztec-node:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build and test"
-          command: build aztec-node | add_timestamps
-
   mainnet-fork:
     machine:
       image: ubuntu-2204:2023.07.2
@@ -479,32 +457,6 @@ jobs:
           name: "Build and test"
           command: build aztec-faucet | add_timestamps
 
-  pxe-x86_64:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build and test"
-          command: build pxe false x86_64
-
-  pxe-arm64:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: arm.large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build and test"
-          # We need to force not to use docker buildkit because for some reason on arm only, it ends up making a call
-          # out to eu-west2 despite the image being locally tagged, resulting in unauthorized 401. Weird docker bug?
-          command: |
-            echo "export DOCKER_BUILDKIT=" > $BASH_ENV
-            build pxe false arm64
-
   ecr-manifest:
     machine:
       image: ubuntu-2204:2023.07.2
@@ -516,7 +468,6 @@ jobs:
           name: "Create ECR manifest"
           command: |
             create_ecr_manifest aztec-sandbox x86_64,arm64
-            create_ecr_manifest pxe x86_64,arm64
             create_ecr_manifest cli x86_64,arm64
 
   boxes-blank-react:
@@ -1033,17 +984,6 @@ jobs:
   #         name: "Deploy to dockerhub"
   #         command: yarn-project/deploy_dockerhub.sh canary
 
-  # deploy-ecr:
-  #   machine:
-  #     image: ubuntu-2204:2023.07.2
-  #   resource_class: medium
-  #   steps:
-  #     - *checkout
-  #     - *setup_env
-  #     - run:
-  #         name: "yarn-project"
-  #         command: yarn-project/deploy_ecr.sh
-
   deploy-dockerhub:
     machine:
       image: ubuntu-2204:2023.07.2
@@ -1112,7 +1052,7 @@ defaults: &defaults
     - slack/notify:
         event: fail
         branch_pattern: "master"
-deploy_defaults: &deploy_defaults
+release_defaults: &release_defaults
   filters:
     tags:
       only: *tag_regex
@@ -1201,7 +1141,7 @@ workflows:
       - deploy-mainnet-fork:
           requires:
             - mainnet-fork
-          <<: *deploy_defaults
+          <<: *release_defaults
 
       # Yarn Project
       - yarn-project-base:
@@ -1254,36 +1194,15 @@ workflows:
             - yarn-project
           <<: *defaults
 
-      - aztec-p2p-bootstrap:
-          requires:
-            - yarn-project
-          <<: *defaults
-
-      - aztec-node:
-          requires:
-            - yarn-project
-          <<: *defaults
-
       - aztec-faucet:
           requires:
             - yarn-project
           <<: *defaults
 
-      - pxe-x86_64:
-          requires:
-            - yarn-project
-          <<: *defaults
-      - pxe-arm64:
-          requires:
-            - yarn-project
-          <<: *defaults
-
       - ecr-manifest:
           requires:
             - aztec-sandbox-x86_64
             - aztec-sandbox-arm64
-            - pxe-x86_64
-            - pxe-arm64
             - cli-x86_64
             - cli-arm64
           <<: *defaults
@@ -1390,53 +1309,53 @@ workflows:
       # - deploy-npm-canary:
       #     requires:
       #       - e2e-end
-      #     <<: *deploy_defaults
+      #     <<: *release_defaults
       # - deploy-dockerhub-canary:
       #     requires:
       #       - e2e-end
-      #     <<: *deploy_defaults
+      #     <<: *release_defaults
       # - deploy-ecr:
       #     requires:
       #       - e2e-end
-      #     <<: *deploy_defaults
+      #     <<: *release_defaults
 
       # - build-deployment-canary:
       #     requires:
       #       - deploy-npm-canary
       #       - deploy-dockerhub-canary
-      #     <<: *deploy_defaults
+      #     <<: *release_defaults
 
       # Run canary tests
       # - canary-uniswap-test:
       #     requires:
       #       - build-deployment-canary
-      #     <<: *deploy_defaults
+      #     <<: *release_defaults
 
       # - canary-browser-test:
       #     requires:
       #       - build-deployment-canary
-      #     <<: *deploy_defaults
+      #     <<: *release_defaults
 
       # - canary-cli-test:
       #     requires:
       #       - build-deployment-canary
-      #     <<: *deploy_defaults
+      #     <<: *release_defaults
 
       # - canary-end:
       #     requires:
       #       - canary-uniswap-test
       #       - canary-browser-test
       #       - canary-cli-test
-      #     <<: *deploy_defaults
+      #     <<: *release_defaults
 
       # Production deployment
       - deploy-dockerhub:
           requires:
             # - canary-end
             - e2e-end
-          <<: *deploy_defaults
+          <<: *release_defaults
       - deploy-npm:
           requires:
             # - canary-end
             - e2e-end
-          <<: *deploy_defaults
+          <<: *release_defaults
diff --git a/build-system/scripts/create_dockerhub_manifest b/build-system/scripts/create_dockerhub_manifest
@@ -20,14 +20,11 @@ DIST_TAG=${3:-"latest"}
 echo "Repo: $REPOSITORY"
 echo "Arch list: $ARCH_LIST"
 
-ACCOUNT="aztecprotocol"
-USERNAME="aztecprotocolci"
-
 # Extract the version, if valid; exit otherwise.
 IMAGE_TAG=$(extract_tag_version $REPOSITORY true)
 
-MANIFEST_DEPLOY_URI=$ACCOUNT/$REPOSITORY:$IMAGE_TAG
-MANIFEST_DIST_URI=$ACCOUNT/$REPOSITORY:$DIST_TAG
+MANIFEST_DEPLOY_URI=$DOCKERHUB_ACCOUNT/$REPOSITORY:$IMAGE_TAG
+MANIFEST_DIST_URI=$DOCKERHUB_ACCOUNT/$REPOSITORY:$DIST_TAG
 
 # Login to dockerhub.
 dockerhub_login
@@ -38,9 +35,8 @@ OLD_IFS=$IFS
 IFS=','
 
 # For each arch, add the tagged image to 2 manifest lists. One tagged with the version, the other with 'latest'
-for A in $ARCH_LIST
-do
-  IMAGE_DEPLOY_URI=$ACCOUNT/$REPOSITORY:$IMAGE_TAG-$A
+for A in $ARCH_LIST; do
+  IMAGE_DEPLOY_URI=$DOCKERHUB_ACCOUNT/$REPOSITORY:$IMAGE_TAG-$A
   echo "Adding image $IMAGE_DEPLOY_URI to manifest list $MANIFEST_DEPLOY_URI"
   docker_or_dryrun manifest create $MANIFEST_DEPLOY_URI \
     --amend $IMAGE_DEPLOY_URI

diff --git a/build-system/scripts/deploy_dockerhub b/build-system/scripts/deploy_dockerhub
@@ -14,9 +14,6 @@ DIST_TAG=${3:-"latest"}
 echo "Repo: $REPOSITORY"
 echo "Arch: $ARCH"
 
-ACCOUNT="aztecprotocol"
-USERNAME="aztecprotocolci"
-
 IMAGE_COMMIT_URI=$(calculate_image_uri $REPOSITORY)
 
 IMAGE_DIST_URI=$ACCOUNT/$REPOSITORY:$DIST_TAG

diff --git a/build-system/scripts/docker_login b/build-system/scripts/docker_login
diff --git a/build-system/scripts/dockerhub_login b/build-system/scripts/dockerhub_login
@@ -2,7 +2,7 @@
 set -eu
 # Retries up to 3 times with 10 second intervals
 for i in $(seq 1 3); do
-  echo "$DOCKERHUB_PASSWORD" | docker login -u aztecprotocolci --password-stdin && exit || sleep 10
+  echo "$DOCKERHUB_PASSWORD" | docker login -u $DOCKERHUB_USERNAME --password-stdin && exit || sleep 10
 done
 echo "$@ failed dockerhub_login after 3 attempts"
 exit 1
diff --git a/build-system/scripts/setup_env b/build-system/scripts/setup_env
@@ -78,6 +78,8 @@ echo export AWS_ACCOUNT=278380418400 >> $BASH_ENV
 echo export ECR_URL=278380418400.dkr.ecr.us-east-2.amazonaws.com >> $BASH_ENV
 echo export ECR_DEPLOY_REGION=eu-west-2 >> $BASH_ENV
 echo export ECR_DEPLOY_URL=278380418400.dkr.ecr.eu-west-2.amazonaws.com >> $BASH_ENV
+echo export DOCKERHUB_ACCOUNT=aztecprotocol >> $BASH_ENV
+echo export DOCKERHUB_USERNAME=aztecprotocolci >> $BASH_ENV
 echo export PROJECT=$PROJECT >> $BASH_ENV
 echo export COMMIT_HASH=$COMMIT_HASH >> $BASH_ENV
 echo export COMMIT_TAG=$COMMIT_TAG >> $BASH_ENV

diff --git a/build_manifest.yml b/build_manifest.yml
@@ -106,12 +106,6 @@ cli:
   dependencies:
     - yarn-project
 
-pxe:
-  buildDir: yarn-project
-  projectDir: yarn-project/pxe
-  dependencies:
-    - yarn-project
-
 boxes-blank-react:
   buildDir: yarn-project
   projectDir: yarn-project/boxes/blank-react
@@ -151,18 +145,6 @@ end-to-end:
   runDependencies:
     - aztec-sandbox
 
-aztec-node:
-  buildDir: yarn-project
-  projectDir: yarn-project/aztec-node
-  dependencies:
-    - yarn-project
-
-p2p-bootstrap:
-  buildDir: yarn-project
-  projectDir: yarn-project/p2p-bootstrap
-  dependencies:
-    - yarn-project
-
 mainnet-fork:
   buildDir: iac/mainnet-fork
   projectDir: iac/mainnet-fork

diff --git a/yarn-project/aztec-node/.dockerignore b/yarn-project/aztec-node/.dockerignore
diff --git a/yarn-project/aztec-node/Dockerfile b/yarn-project/aztec-node/Dockerfile
diff --git a/yarn-project/deploy_dockerhub.sh b/yarn-project/deploy_dockerhub.sh
@@ -5,7 +5,7 @@ DIST_TAG=${1:-"latest"}
 extract_repo yarn-project /usr/src project
 PROJECT_ROOT=$(pwd)/project/src/
 
-for REPOSITORY in "pxe" "aztec-sandbox" "cli"; do
+for REPOSITORY in "aztec-sandbox" "cli"; do
   echo "Deploying $REPOSITORY $DIST_TAG"
   RELATIVE_PROJECT_DIR=$(query_manifest relativeProjectDir $REPOSITORY)
   cd "$PROJECT_ROOT/$RELATIVE_PROJECT_DIR"

diff --git a/yarn-project/deploy_ecr.sh b/yarn-project/deploy_ecr.sh
diff --git a/yarn-project/end-to-end/scripts/docker-compose-p2p.yml b/yarn-project/end-to-end/scripts/docker-compose-p2p.yml
@@ -7,11 +7,12 @@ services:
       - '8545:8545'
 
   p2p-bootstrap:
-    image: aztecprotocol/p2p-bootstrap:latest
+    image: aztecprotocol/aztec-sandbox:latest
     ports:
       - '40400:40400'
     command: 'start'
     environment:
+      MODE: 'p2p-bootstrap'
       DEBUG: 'aztec:*'
       DEBUG_COLORS: 1
       P2P_TCP_LISTEN_PORT: 40400

diff --git a/yarn-project/p2p-bootstrap/Dockerfile b/yarn-project/p2p-bootstrap/Dockerfile
diff --git a/yarn-project/p2p-bootstrap/scripts/docker-compose-bootstrap.yml b/yarn-project/p2p-bootstrap/scripts/docker-compose-bootstrap.yml
@@ -1,10 +1,11 @@
 version: '3'
 services:
   p2p-bootstrap:
-    image: 278380418400.dkr.ecr.eu-west-2.amazonaws.com/p2p-bootstrap:latest
+    image: 278380418400.dkr.ecr.eu-west-2.amazonaws.com/aztec-sandbox:latest
     ports:
       - '40400:40400'
     environment:
+      MODE: 'p2p-bootstrap'
       DEBUG: 'aztec:*'
       P2P_TCP_LISTEN_PORT: 40400
       PEER_ID: '0a260024080112205ea53185db2e52dae74d0d4d6cadc494174810d0a713cd09b0ac517c38bc781e1224080112205ea53185db2e52dae74d0d4d6cadc494174810d0a713cd09b0ac517c38bc781e1a44080112402df8b977f356c6e34fa021c9647973234dff4df706c185794405aafb556723cf5ea53185db2e52dae74d0d4d6cadc494174810d0a713cd09b0ac517c38bc781e'