Fix building and running docker images

.dockerignore

@@ -9,11 +9,14 @@
 !docker/nginx/nginx.conf
 !bin/
 !core/
+!yarn.lock
+!package.json
 !Cargo.lock
 !Cargo.toml
 !contracts/build
 !infrastructure/explorer/index.html
 !infrastructure/explorer/dist
 !infrastructure/fee-seller
 !infrastructure/tok_cli
+!infrastructure/zk
 !sdk/zksync-rs

.github/workflows/ci.yml

@@ -30,6 +30,9 @@ jobs:
     - name: zk
       run: zk
 
+    - name: check-docker-images
+      run: zk docker build rust
+
     - name: lints
       run: |
         zk db setup # So database will be created for compilation.

docker/exit-tool/exit-tool-entry.sh

@@ -7,8 +7,6 @@
 
 USAGE="exit_tool_entry.sh init|restart|run|continue network account_id token web3_url"
 
-. .setup_env
-
 cd $ZKSYNC_HOME
 
 if [ -z $ZKSYNC_ENV ];

docker/prover/Dockerfile

@@ -10,7 +10,9 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
     cargo build --release
 
 FROM debian:buster-slim
-RUN apt-get update && apt-get install -y axel ca-certificates && rm -rf /var/lib/apt/lists/*
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
+RUN apt-get update && apt-get install -y axel ca-certificates nodejs npm \
+    && npm install -g yarn && rm -rf /var/lib/apt/lists/*
 # Docs of env variables used for this image
 # to test this locally just run
 # docker build -t tmp_prover -f =(f envsubst < ./docker/prover/Dockerfile) .; docker run --rm  tmp_prover:latest
@@ -35,8 +37,8 @@ COPY --from=builder /usr/src/zksync/target/release/plonk_step_by_step_prover /bi
 COPY --from=builder /usr/src/zksync/target/release/dummy_prover /bin/
 COPY docker/prover/prover-entry.sh /bin/
 COPY keys/packed /keys/packed
-COPY contracts/build/ /contracts/build/
-COPY infrastructure/zk/ infrastructure/zk/
+COPY contracts/build /contracts/build
+COPY infrastructure/zk /infrastructure/zk
 COPY bin/zk /bin/
 
 CMD ["prover-entry.sh"]

docker/prover/prover-entry.sh

@@ -34,7 +34,8 @@ function get_required_plonk_setup_powers() {
 # we download only keys used in node (defined by $BLOCK_CHUNK_SIZES)
 REQUIRED_SETUP_POWS=`get_required_plonk_setup_powers`
 # install zk
-zk
+echo installing zk
+cd /infrastructure/zk && yarn install && yarn build
 
 if [ "$PROVER_DOWNLOAD_SETUP" == "false" ]; then
   echo Downloading setup powers $REQUIRED_SETUP_POWS

infrastructure/zk/src/contract.ts

@@ -29,9 +29,7 @@ export async function build() {
 async function prepareTestContracts() {
     const inDir = 'contracts/contracts';
     const outDir = 'contracts/dev-contracts/generated';
-    if (fs.existsSync(outDir)) {
-        fs.rmdirSync(outDir, { recursive: true });
-    }
+    fs.rmSync(outDir, { recursive: true, force: true });
     fs.mkdirSync(outDir, { recursive: true });
 
     await Promise.all([