Skip to content

feat: -d or --dev flag #401

New issue

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

Sign up for

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

Already on ? Sign in to your account

Merged
merged 12 commits into from
Feb 22, 2022
Merged

feat: -d or --dev flag #401

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
449ae30
feat: added the -d flag so we can use the same start-nightfall script…
signorecelloJan 12, 2022
9d371e0
feat: documenting the change. Also made the documentation on the flag…
signorecelloJan 12, 2022
56cd56b
feat: detached the process after deployment, updated readme
signorecelloJan 13, 2022
356bf4f
fix: fixed the order of docker-compose arguments
signorecelloJan 14, 2022
00a86ab
fix: fixing conflicts
signorecelloJan 26, 2022
c5b7478
fix: making changes as requested
signorecelloJan 26, 2022
949f087
fix: fixing conflicts
signorecelloFeb 21, 2022
b402c8e
fix: updating the action to use the -d flag
signorecelloFeb 21, 2022
1a9cbb0
fix: updating the action to use the -d flag
signorecelloFeb 21, 2022
d62ae0b
fix: updating the action to use the -d flag
signorecelloFeb 21, 2022
9a5b708
fix: updating the action to use the -d flag
signorecelloFeb 21, 2022
6671738
fix: updating the action to use the -d flag
signorecelloFeb 21, 2022
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
PrevPrevious commit
Next Next commit
fix: making changes as requested
  • Loading branch information
@signorecello
signorecello committedJan 26, 2022
commit c5b7478b0f558f8f9020ab05c8bc515f960a00b9
22 changes: 12 additions & 10 deletions docker-compose.dev.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@ version: '3.5'
services:
client1:
build:
dockerfile: Dockerfile
context: ./nightfall-client
dockerfile: client.Dockerfile
context: .
volumes:
- type: bind
source: ./nightfall-client/src
Expand All@@ -19,8 +19,8 @@ services:

client2:
build:
dockerfile: Dockerfile
context: ./nightfall-client
dockerfile: client.Dockerfile
context: .
volumes:
- type: bind
source: ./nightfall-client/src
Expand All@@ -35,8 +35,8 @@ services:
worker:
# image: 3800decac71d
build:
dockerfile: Dockerfile
context: ./zokrates-worker
dockerfile: worker.Dockerfile
context: .
volumes:
- type: bind
source: ./nightfall-deployer/circuits
Expand All@@ -51,8 +51,8 @@ services:
#image: docker.pkg..com/eyblockchain/nightfall-deployer/nightfall_deployer:1.1.0

build:
context: ./nightfall-deployer
dockerfile: Dockerfile
dockerfile: deployer.Dockerfile
context: .
volumes:
- type: bind
source: ./nightfall-deployer/contracts
Expand DownExpand Up@@ -82,7 +82,8 @@ services:
optimist1:

build:
context: ./nightfall-optimist
dockerfile: optimist.Dockerfile
context: .
volumes:

- type: bind
Expand All@@ -97,7 +98,8 @@ services:
optimist2:

build:
context: ./nightfall-optimist
dockerfile: optimist.Dockerfile
context: .
volumes:

- type: bind
Expand Down
19 changes: 0 additions & 19 deletions docker-compose.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@ version: '3.5'
services:
client1:
image: ghcr.io/eyblockchain/nightfall3-client:latest
build:
dockerfile: client.Dockerfile
context: .
volumes:
- type: volume
source: build
Expand DownExpand Up@@ -40,9 +37,6 @@ services:

client2:
image: ghcr.io/eyblockchain/nightfall3-client:latest
build:
dockerfile: client.Dockerfile
context: .
volumes:
- type: volume
source: build
Expand DownExpand Up@@ -77,9 +71,6 @@ services:
worker:
# image: 3800decac71d
image: ghcr.io/eyblockchain/nightfall3-worker:latest
build:
dockerfile: worker.Dockerfile
context: .
volumes:
- type: volume
source: proving_files
Expand All@@ -95,9 +86,6 @@ services:
deployer:
#image: docker.pkg..com/eyblockchain/nightfall-deployer/nightfall_deployer:1.1.0
image: ghcr.io/eyblockchain/nightfall3-deployer:latest
build:
dockerfile: deployer.Dockerfile
context: .
volumes:
- type: volume
source: build
Expand DownExpand Up@@ -132,9 +120,6 @@ services:

optimist1:
image: ghcr.io/eyblockchain/nightfall3-optimist:latest
build:
dockerfile: optimist.Dockerfile
context: .
depends_on:
- deployer
networks:
Expand All@@ -158,11 +143,7 @@ services:
command: [ 'npm', 'run', 'dev' ]

optimist2:

image: ghcr.io/eyblockchain/nightfall3-optimist:latest
build:
dockerfile: optimist.Dockerfile
context: .
depends_on:
- deployer
networks:
Expand Down