From 9d5724e1a0f2ffcd33622b285fdef477ec36ecc6 Mon Sep 17 00:00:00 2001 From: "F. Eugene Aumson" Date: Thu, 2 Jan 2020 20:19:06 -0500 Subject: [PATCH] Fix 0xorg/ganache-cli docker image not supporting re-runs (#2420) * Overwrite existing snapshot when unzipping * Don't re-download snapshot if it isn't updated * Update CHANGELOG.json --- packages/migrations/CHANGELOG.json | 4 ++++ packages/migrations/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index ac9add1005..4f21e06c21 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -5,6 +5,10 @@ { "note": "Added DydxBridge Contract to ContractAddresses", "pr": 2401 + }, + { + "note": "Changed docker image command to overwrite any existing snapshot when unzipping the image downloaded from S3.", + "pr": 2420 } ] }, diff --git a/packages/migrations/Dockerfile b/packages/migrations/Dockerfile index dbe2eacdc4..d317b2d7b6 100644 --- a/packages/migrations/Dockerfile +++ b/packages/migrations/Dockerfile @@ -11,5 +11,5 @@ ENV SNAPSHOT_HOST "http://ganache-snapshots.0x.org.s3-website.us-east-2.amazonaw ENV SNAPSHOT_NAME "0x_ganache_snapshot" EXPOSE 8545 -CMD [ "sh", "-c", "echo downloading snapshot version: $VERSION; wget $SNAPSHOT_HOST/$SNAPSHOT_NAME-$VERSION.zip -O snapshot.zip && unzip snapshot.zip && ganache-cli --gasLimit 10000000 --db $SNAPSHOT_NAME --noVMErrorsOnRPCResponse -p 8545 --keepAliveTimeout=40000 --networkId \"$NETWORK_ID\" -m \"$MNEMONIC\" -h 0.0.0.0"] +CMD [ "sh", "-c", "echo downloading snapshot version: $VERSION; wget --timestamping $SNAPSHOT_HOST/$SNAPSHOT_NAME-$VERSION.zip -O snapshot.zip && unzip -o snapshot.zip && ganache-cli --gasLimit 10000000 --db $SNAPSHOT_NAME --noVMErrorsOnRPCResponse -p 8545 --keepAliveTimeout=40000 --networkId \"$NETWORK_ID\" -m \"$MNEMONIC\" -h 0.0.0.0"]