From 93d9c12ba4113c2aaf9ba7d458636a09a184edd8 Mon Sep 17 00:00:00 2001 From: benesjan Date: Wed, 4 Oct 2023 08:12:24 +0000 Subject: [PATCH 1/5] deploy_dockerhub.sh --- .circleci/config.yml | 25 +++---------------------- yarn-project/deploy_dockerhub.sh | 8 ++++++++ 2 files changed, 11 insertions(+), 22 deletions(-) create mode 100644 yarn-project/deploy_dockerhub.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index a8bbcce8be40..29ca073c83fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1032,7 +1032,7 @@ 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 @@ -1040,27 +1040,8 @@ jobs: - *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: diff --git a/yarn-project/deploy_dockerhub.sh b/yarn-project/deploy_dockerhub.sh new file mode 100644 index 000000000000..6ad7a6c6e580 --- /dev/null +++ b/yarn-project/deploy_dockerhub.sh @@ -0,0 +1,8 @@ +#!/bin/bash +deploy_dockerhub aztec-sandbox x86_64 +deploy_dockerhub aztec-sandbox arm64 +create_dockerhub_manifest aztec-sandbox x86_64,arm64 + +deploy_dockerhub pxe x86_64 +deploy_dockerhub pxe arm64 +create_dockerhub_manifest pxe x86_64,arm64 \ No newline at end of file From 710971706c618fca279c6fba460dc66fe765f856 Mon Sep 17 00:00:00 2001 From: benesjan Date: Wed, 4 Oct 2023 08:15:19 +0000 Subject: [PATCH 2/5] fix --- .circleci/config.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 29ca073c83fa..2515a2e47022 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1369,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 @@ -1384,8 +1380,7 @@ workflows: - deploy-end: requires: - - deploy-dockerhub-sandbox - - deploy-dockerhub-pxe + - deploy-dockerhub - deploy-npm <<: *deploy_defaults From b031801f5964becd7c5946874c766237b7c71255 Mon Sep 17 00:00:00 2001 From: benesjan Date: Wed, 4 Oct 2023 08:21:40 +0000 Subject: [PATCH 3/5] fix --- yarn-project/deploy_dockerhub.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yarn-project/deploy_dockerhub.sh b/yarn-project/deploy_dockerhub.sh index 6ad7a6c6e580..fcdb6e936b9a 100644 --- a/yarn-project/deploy_dockerhub.sh +++ b/yarn-project/deploy_dockerhub.sh @@ -1,8 +1,13 @@ #!/bin/bash + +extract_repo yarn-project /usr/src project + +cd project/src/yarn-project/aztec-sandbox deploy_dockerhub aztec-sandbox x86_64 deploy_dockerhub aztec-sandbox arm64 create_dockerhub_manifest aztec-sandbox x86_64,arm64 +cd ../pxe deploy_dockerhub pxe x86_64 deploy_dockerhub pxe arm64 create_dockerhub_manifest pxe x86_64,arm64 \ No newline at end of file From 77a1b309701b401c147bcaafe1fc144960388d9c Mon Sep 17 00:00:00 2001 From: benesjan Date: Wed, 4 Oct 2023 12:01:12 +0200 Subject: [PATCH 4/5] chore: default PXE_PORT set to 8080 in pxe package --- yarn-project/pxe/src/bin/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn-project/pxe/src/bin/index.ts b/yarn-project/pxe/src/bin/index.ts index 012742ca34d8..21de0ee64dd2 100644 --- 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'); From 217369174b5207413a79806445b35ce0c4341632 Mon Sep 17 00:00:00 2001 From: benesjan Date: Wed, 4 Oct 2023 10:53:40 +0000 Subject: [PATCH 5/5] refactor --- yarn-project/deploy_dockerhub.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/yarn-project/deploy_dockerhub.sh b/yarn-project/deploy_dockerhub.sh index fcdb6e936b9a..5e7d83dd891c 100644 --- a/yarn-project/deploy_dockerhub.sh +++ b/yarn-project/deploy_dockerhub.sh @@ -1,13 +1,15 @@ #!/bin/bash extract_repo yarn-project /usr/src project +PROJECT_ROOT=$(pwd)/project/src/ -cd project/src/yarn-project/aztec-sandbox -deploy_dockerhub aztec-sandbox x86_64 -deploy_dockerhub aztec-sandbox arm64 -create_dockerhub_manifest aztec-sandbox x86_64,arm64 +for REPOSITORY in "pxe" "aztec-sandbox" +do + echo "Deploying $REPOSITORY" + RELATIVE_PROJECT_DIR=$(query_manifest relativeProjectDir $REPOSITORY) + cd "$PROJECT_ROOT/$RELATIVE_PROJECT_DIR" -cd ../pxe -deploy_dockerhub pxe x86_64 -deploy_dockerhub pxe arm64 -create_dockerhub_manifest pxe x86_64,arm64 \ No newline at end of file + deploy_dockerhub $REPOSITORY x86_64 + deploy_dockerhub $REPOSITORY arm64 + create_dockerhub_manifest $REPOSITORY x86_64,arm64 +done