Avoid zk in data restore (#2238)

* Avoid zk in data restore Signed-off-by: deniallugo <[email protected]> * Make migrate function for data-restore Signed-off-by: deniallugo <[email protected]>
versace717 · May 4, 2022 · 1468bf6 · 1468bf6
1 parent 991f0e1
commit 1468bf6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/docker/data-restore/Dockerfile b/docker/data-restore/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.53
+FROM rust:1.60
 
 WORKDIR /usr/src/zksync
 
@@ -30,8 +30,5 @@ COPY docker/data-restore/data-restore-entry.sh /bin/
 # Setup the environment
 ENV ZKSYNC_HOME=/usr/src/zksync
 ENV PATH="${ZKSYNC_HOME}/bin:${PATH}"
-ENV IN_DOCKER=true
-
-RUN cd $ZKSYNC_HOME && zk
 
 ENTRYPOINT ["data-restore-entry.sh"]
diff --git a/docker/data-restore/data-restore-entry.sh b/docker/data-restore/data-restore-entry.sh
@@ -2,10 +2,18 @@
 
 set -e
 
-cd $ZKSYNC_HOME
+function migrate() {
+      psql "$DATABASE_URL" -c 'DROP OWNED BY CURRENT_USER CASCADE' || /bin/true
+      psql "$DATABASE_URL" -c 'DROP SCHEMA IF EXISTS public CASCADE' || /bin/true
+      psql "$DATABASE_URL" -c 'CREATE SCHEMA public'
+
+      cd core/lib/storage
+      diesel database setup
+      diesel migration run
+      cd $ZKSYNC_HOME
+}
 
-# Load the environment
-export $(cat $ZKSYNC_HOME/etc/env/docker.env | sed 's/#.*//g' | xargs)
+cd $ZKSYNC_HOME
 
 # Wait for the database to be ready.
 until pg_isready -d $DATABASE_URL; do
@@ -21,8 +29,7 @@ fi
 case $COMMAND in
   genesis)
       echo "Resetting the database"
-      zk db drop || true
-      zk db basic-setup
+      migrate
       COMMAND="--genesis"
     ;;
   continue)
@@ -62,12 +69,12 @@ then
   # Do not drop db if the file doesn't exist.
   [ -f /pg_restore/$PG_DUMP ] || { echo "$PG_DUMP not found" ; exit 1 ; }
 
-  zk db drop || true
-  zk db basic-setup
+  migrate
+
   echo "Applying $PG_DUMP"
   pg_restore -j 8 -d $DATABASE_URL --clean --if-exists /pg_restore/$PG_DUMP
 fi
 
 CONFIG_FILE="/usr/src/configs/${NETWORK}.json"
 
-zk f ./target/release/zksync_data_restore $COMMAND $MODE --config $CONFIG_FILE --web3 $WEB3_URL || exit 1
+./target/release/zksync_data_restore $COMMAND $MODE --config $CONFIG_FILE --web3 $WEB3_URL || exit 1