Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change oracle production docker context #66

Merged
merged 8 commits into from
May 23, 2019
Merged

Change oracle production docker context #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ef0b966
Use main yarn.lock when building oracle docker
rzadp May 23, 2019
14a298f
Production installation
rzadp May 23, 2019
2c7c70f
Common dockerignore.
rzadp May 23, 2019
082db73
Updated build paths in e2e
rzadp May 23, 2019
cc9d475
Dockerignore
rzadp May 23, 2019
ad9cb26
Fix ui-e2e tests not working on CI
rzadp May 23, 2019
f22e32c
Ignoring images only in the oracle
rzadp May 23, 2019
a714aec
Merge master into docker-package-lock
rzadp May 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions oracle-e2e/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions oracle/.dockerignore
View file
Open in desktop

This file was deleted.

11 changes: 7 additions & 4 deletions oracle/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
20 changes: 15 additions & 5 deletions oracle/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
Loading