From c5e5dbca453b2591d39d1c3fc27a1a30c9a93c38 Mon Sep 17 00:00:00 2001 From: Hyunjae Lee Date: Wed, 18 Oct 2023 13:55:55 +0900 Subject: [PATCH] linked0 dockerhub --- .gitignore | 2 +- docker/local-node/Dockerfile | 2 +- etc/tokens/localhost.json | 1 + infrastructure/zk/src/docker.ts | 28 ++++++++++++++-------------- 4 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 etc/tokens/localhost.json diff --git a/.gitignore b/.gitignore index 8d3d81418b78..12a187f50658 100644 --- a/.gitignore +++ b/.gitignore @@ -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/* diff --git a/docker/local-node/Dockerfile b/docker/local-node/Dockerfile index 83aa90aeda70..dc6176eb6dde 100644 --- a/docker/local-node/Dockerfile +++ b/docker/local-node/Dockerfile @@ -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 / diff --git a/etc/tokens/localhost.json b/etc/tokens/localhost.json new file mode 100644 index 000000000000..fe51488c7066 --- /dev/null +++ b/etc/tokens/localhost.json @@ -0,0 +1 @@ +[] diff --git a/infrastructure/zk/src/docker.ts b/infrastructure/zk/src/docker.ts index 17e93117b965..d2cd5506f6a9 100644 --- a/infrastructure/zk/src/docker.ts +++ b/infrastructure/zk/src/docker.ts @@ -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 @@ -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}`); } } }