Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: 1 deploy_dockerhub CI task #2670

Merged
merged 6 commits into from
Oct 4, 2023
Merged

chore: 1 deploy_dockerhub CI task #2670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
93d9c12
deploy_dockerhub.sh
benesjan Oct 4, 2023
7109717
fix
benesjan Oct 4, 2023
b031801
fix
benesjan Oct 4, 2023
77a1b30
chore: default PXE_PORT set to 8080 in pxe package
benesjan Oct 4, 2023
2173691
refactor
benesjan Oct 4, 2023
3e7b3e8
Merge branch 'janb/1_deploy_dockerhub_task' of https://github.com/Azt…
benesjan Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 5 additions & 29 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -1403,8 +1380,7 @@ workflows:

- deploy-end:
requires:
- deploy-dockerhub-sandbox
- deploy-dockerhub-pxe
- deploy-dockerhub
- deploy-npm
<<: *deploy_defaults

Expand Down
15 changes: 15 additions & 0 deletions yarn-project/deploy_dockerhub.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion yarn-project/pxe/src/bin/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down