Skip to content

Commit

Permalink
Fixing Docker build
Browse files Browse the repository at this point in the history
	- Forced synchronicity for the Docker build chain
  • Loading branch information
Zaknarfen committed Jun 14, 2018
1 parent aa4ac08 commit d0d0347
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
11 changes: 11 additions & 0 deletions docker-compose-app.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: '3'
services:
wall-of-targets:
build:
context: .
dockerfile: Dockerfile
container_name: wall-of-targets
environment:
- MONGO_URI=mongodb://mongodb/walloftargets
ports:
- '3000:3000'
13 changes: 1 addition & 12 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
version: '3'
services:
wall-of-targets:
build:
context: .
dockerfile: Dockerfile
container_name: wall-of-targets
environment:
- MONGO_URI=mongodb://mongodb/walloftargets
links:
- mongodb
ports:
- '3000:3000'
mongodb:
image: 'mongo'
ports:
Expand All @@ -26,4 +15,4 @@ services:
context: ../data
dockerfile: ../WallOfTargets/mongo-seed/Dockerfile-links
links:
- mongo_seed
- mongodb
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
"build:aot": "npm run build:aot:prod",
"build:aot:dev": "cross-env BUILD_AOT=1 npm run build:dev",
"build:dev": "npm run clean:dist && npm run webpack -- --config config/webpack.dev.js --progress --profile",
"build:docker": "docker-compose up --build",
"build:docker:app": "docker-compose -f ./docker-compose-app.yml up -d --build",
"build:docker:mongo": "docker-compose -f ./docker-compose.yml up -d --build",
"build:docker": "npm run build:docker:mongo && npm run build:docker:app",
"build:prod": "npm run clean:dist && npm run webpack -- --config config/webpack.prod.js --progress --profile --bail",
"build:server:dev": "npm run clean:server && npm run webpack:server -- --config config/webpack.server.js --progress --profile --bail",
"build:server:docker": "npm run clean:server && cross-env NODE_ENV=production Docker=true npm run webpack:server -- --config config/webpack.server.js --progress --profile --bail",
Expand Down

0 comments on commit d0d0347

Please sign in to comment.