From 9d22bbb0f799eef145bc4e6b0dc4fbcd615ca6ae Mon Sep 17 00:00:00 2001
From: uvorbs <yuval@orbs.com>
Date: Tue, 22 Mar 2022 09:36:15 +0200
Subject: [PATCH] docker same fix as in eth-writer

---
 Dockerfile             | 6 +++---
 e2e/docker-compose.yml | 3 ++-
 e2e/driver.ts          | 6 ++++--
 package-lock.json      | 7 +------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c555eaa..0022ce6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,6 @@ WORKDIR /opt/orbs
 COPY package*.json ./
 COPY .version ./version
 
-RUN apk add --no-cache git
-
 # see https://github.com/nodejs/docker-node/issues/282
 
 # --no-cache: download package index on-the-fly, no need to cleanup afterwards
@@ -20,7 +18,9 @@ RUN apk --no-cache --virtual build-dependencies add \
     && npm install \
     && apk del build-dependencies
 
-RUN npm install
+
+RUN apk add --no-cache git
+RUN npm install 
 
 COPY dist ./dist
 
diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
index e1d7004..428226b 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -5,7 +5,8 @@ services:
             context: .
             dockerfile: ./Dockerfile-app.test
     signer:
-        image: orbsnetwork/signer:experimental
+        #image: orbsnetwork/signer:experimental
+        image: orbsnetwork/signer:v2.4.0
         ports:
             - 7777:7777
         volumes:
diff --git a/e2e/driver.ts b/e2e/driver.ts
index 3e46a24..6424153 100644
--- a/e2e/driver.ts
+++ b/e2e/driver.ts
@@ -72,7 +72,7 @@ export class TestEnvironment {
     // step 2 - let ganache warm up
     test.serial.before(async (t) => {
       t.log('[E2E] wait 5 seconds for ganache to warm up');
-      await sleep(5000);
+      await sleep(15000);
     });
 
     // step 3 - deploy ethereum PoS contracts to ganache
@@ -122,7 +122,9 @@ export class TestEnvironment {
       t.timeout(60 * 1000);
       // note that gamma virtual chain id is always hard-coded as 42
       const gammaAddress = await getAddressForService(this.envName, this.pathToDockerCompose, 'chain-42', 8080);
-      this.gammaDriver = await new GammaDriver().init(`http://localhost:${portFromAddress(gammaAddress)}`, 42);
+      const gammaUrl = `http://localhost:${portFromAddress(gammaAddress)}`
+      t.log(`gammaUrl URL ${gammaUrl}`)
+      this.gammaDriver = await new GammaDriver().init(gammaUrl, 42);
     });
 
     // step 5 - write config file for app
diff --git a/package-lock.json b/package-lock.json
index 32fec62..66ea39e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5750,7 +5750,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.1.tgz",
       "integrity": "sha512-xowrxvpxojqkagPcWRQVXZl0YXhRhAtBEIq3VoER1NH5Mw1n1o0ojdspp+GS2J//2gCVyrzQDApQ4unGF+QOoA==",
-      "hasInstallScript": true,
       "dependencies": {
         "node-gyp-build": "~3.7.0"
       }
@@ -10633,7 +10632,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.1.tgz",
       "integrity": "sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA==",
-      "hasInstallScript": true,
       "dependencies": {
         "node-addon-api": "^2.0.0",
         "node-gyp-build": "^4.2.0"
@@ -13930,7 +13928,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.2.tgz",
       "integrity": "sha512-UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg==",
-      "hasInstallScript": true,
       "dependencies": {
         "elliptic": "^6.5.2",
         "node-addon-api": "^2.0.0",
@@ -15459,7 +15456,6 @@
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.2.tgz",
       "integrity": "sha512-SwV++i2gTD5qh2XqaPzBnNX88N6HdyhQrNNRykvcS0QKvItV9u3vPEJr+X5Hhfb1JC0r0e1alL0iB09rY8+nmw==",
-      "hasInstallScript": true,
       "dependencies": {
         "node-gyp-build": "~3.7.0"
       }
@@ -15681,8 +15677,7 @@
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "extraneous": true,
-      "hasInstallScript": true
+      "extraneous": true
     },
     "node_modules/ganache-core/node_modules/watchpack-chokidar2/node_modules/glob-parent": {
       "version": "3.1.0",