Merge master into oracle-e2e-contracts

oracle-e2e/docker-compose.yml

@@ -15,7 +15,9 @@ services:
     ports:
       - "15672:15672"
   bridge:
-    build: ../oracle
+    build:
+      context: ..
+      dockerfile: oracle/Dockerfile
     environment:
       - NODE_ENV=production
       - BRIDGE_MODE=NATIVE_TO_ERC
@@ -42,7 +44,9 @@ services:
       - ALLOW_HTTP=yes
     command: "true"
   bridge-erc:
-    build: ../oracle
+    build:
+      context: ..
+      dockerfile: oracle/Dockerfile
     environment:
       - NODE_ENV=production
       - BRIDGE_MODE=ERC_TO_ERC
@@ -70,7 +74,9 @@ services:
       - ALLOW_HTTP=yes
     command: "true"
   bridge-erc-native:
-    build: ../oracle
+    build:
+      context: ..
+      dockerfile: oracle/Dockerfile
     environment:
       - NODE_ENV=production
       - BRIDGE_MODE=ERC_TO_NATIVE

oracle/.dockerignore

@@ -1,6 +0,0 @@
-**/node_modules
-**/submodules
-**/Dockerfile
-**/.dockerignore
-**/docker-compose.yml
-.gitmodules

oracle/Dockerfile

@@ -7,10 +7,13 @@ RUN apt-get install -y libc6-dev-i386
 RUN apt-get install -y wget
 RUN apt-get clean
 
-WORKDIR /bridge
+WORKDIR /mono
 COPY package.json .
-COPY package-lock.json .
-RUN npm install
-COPY . .
+COPY contracts/package.json ./contracts/
+COPY oracle/package.json ./oracle/
+COPY yarn.lock .
+RUN yarn install --production
+COPY ./oracle ./oracle
+WORKDIR /mono/oracle
 CMD echo "To start a bridge process run:" \
   "VALIDATOR_ADDRESS=<validator address> VALIDATOR_ADDRESS_PRIVATE_KEY=<validator address private key> docker-compose up -d --build"

oracle/docker-compose.yml

@@ -31,7 +31,9 @@ services:
   bridge_request:
     cpus: 0.1
     mem_limit: 500m
-    build: .
+    build:
+      context: ..
+      dockerfile: oracle/Dockerfile
     command: 'true'
     env_file: ./.env
     environment: 
@@ -45,7 +47,9 @@ services:
   bridge_collected:
     cpus: 0.1
     mem_limit: 500m
-    build: .
+    build:
+      context: ..
+      dockerfile: oracle/Dockerfile
     command: 'true'
     env_file: ./.env
     environment: 
@@ -59,7 +63,9 @@ services:
   bridge_affirmation:
     cpus: 0.1
     mem_limit: 500m
-    build: .
+    build:
+      context: ..
+      dockerfile: oracle/Dockerfile
     command: 'true'
     env_file: ./.env
     environment: 
@@ -73,7 +79,9 @@ services:
   bridge_senderhome:
     cpus: 0.1
     mem_limit: 500m
-    build: .
+    build:
+      context: ..
+      dockerfile: oracle/Dockerfile
     command: 'true'
     env_file: ./.env
     environment: 
@@ -87,7 +95,9 @@ services:
   bridge_senderforeign:
     cpus: 0.1
     mem_limit: 500m
-    build: .
+    build:
+      context: ..
+      dockerfile: oracle/Dockerfile
     command: 'true'
     env_file: ./.env
     environment: 

ui-e2e/docker-compose.yml

@@ -17,7 +17,9 @@ services:
     ports:
     - "15672:15672"
   bridge:
-    build: ../oracle
+    build:
+      context: ..
+      dockerfile: oracle/Dockerfile
     environment:
     - NODE_ENV=production
     - BRIDGE_MODE=NATIVE_TO_ERC
@@ -44,7 +46,9 @@ services:
     - ALLOW_HTTP=yes
     command: "true"
   bridge-erc20:
-    build: ../oracle
+    build:
+      context: ..
+      dockerfile: oracle/Dockerfile
     environment:
     - NODE_ENV=production
     - BRIDGE_MODE=ERC_TO_ERC
@@ -72,7 +76,9 @@ services:
     - ALLOW_HTTP=yes
     command: "true"
   bridge-erc20-native:
-    build: ../oracle
+    build:
+      context: ..
+      dockerfile: oracle/Dockerfile
     environment:
     - NODE_ENV=production
     - BRIDGE_MODE=ERC_TO_NATIVE