Skip to content

Commit

Permalink
linked0 dockerhub
Browse files Browse the repository at this point in the history
  • Loading branch information
linked0 committed Oct 18, 2023
1 parent 6cb8c2c commit c5e5dbc
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Cargo.lock
!/etc/env/docker.toml
!/etc/env/ext-node.toml
!/etc/env/ext-node-docker.toml
/etc/tokens/localhost.json
!/etc/tokens/localhost.json
/etc/zksolc-bin/*
/etc/zkvyper-bin/*
/etc/solc-bin/*
Expand Down
2 changes: 1 addition & 1 deletion docker/local-node/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Image is always built from the server image to reuse the common parts
# This image is expected to be built locally beforehand (implemented in the `zk` tool)
FROM matterlabs/server-v2:latest2.0
FROM linked0/server-v2:latest2.0

WORKDIR /

Expand Down
1 change: 1 addition & 0 deletions etc/tokens/localhost.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
28 changes: 14 additions & 14 deletions infrastructure/zk/src/docker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ async function _build(image: string, tagList: string[]) {
await contract.build();
}

const tagsToBuild = tagList.map((tag) => `-t matterlabs/${image}:${tag}`).join(' ');
const tagsToBuild = tagList.map((tag) => `-t linked0/${image}:${tag}`).join(' ');
// generate list of tags for image - we want 3 tags (latest, SHA, SHA+TimeStamp) for listed components and only "latest" for everything else

// Conditionally add build argument if image is prover-v2
Expand All @@ -116,20 +116,20 @@ async function _push(image: string, tagList: string[], publishPublic: boolean =
// For development purposes, we want to use `2.0` tags for 2.0 images, just to not interfere with 1.x

for (const tag of tagList) {
await utils.spawn(`docker push matterlabs/${image}:${tag}`);
await utils.spawn(
`docker tag matterlabs/${image}:${tag} us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${image}:${tag}`
);
await utils.spawn(`docker push us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${image}:${tag}`);

if (image == 'circuit-synthesizer') {
await utils.spawn(
`docker tag us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${image}:${tag} asia-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${image}:${tag}`
);
await utils.spawn(`docker push asia-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${image}:${tag}`);
}
await utils.spawn(`docker push linked0/${image}:${tag}`);
// await utils.spawn(
// `docker tag linked0/${image}:${tag} us-docker.pkg.dev/linked0-infra/linked0-docker/${image}:${tag}`
// );
// await utils.spawn(`docker push us-docker.pkg.dev/linked0-infra/linked0-docker/${image}:${tag}`);

// if (image == 'circuit-synthesizer') {
// await utils.spawn(
// `docker tag us-docker.pkg.dev/linked0-infra/linked0-docker/${image}:${tag} asia-docker.pkg.dev/linked0-infra/linked0-docker/${image}:${tag}`
// );
// await utils.spawn(`docker push asia-docker.pkg.dev/linked0-infra/linked0-docker/${image}:${tag}`);
// }
if (image == 'external-node' && publishPublic) {
await utils.spawn(`docker push matterlabs/${image}-public:${tag}`);
await utils.spawn(`docker push linked0/${image}-public:${tag}`);
}
}
}
Expand Down

0 comments on commit c5e5dbc

Please sign in to comment.