Merge pull request #101 from Fmstrat/dev_docker
Docker updates for full files
This commit is contained in:
commit
854f595425
@ -9,3 +9,4 @@
|
|||||||
docker-compose-dev.yml
|
docker-compose-dev.yml
|
||||||
Makefile.custom.config
|
Makefile.custom.config
|
||||||
*.log
|
*.log
|
||||||
|
data
|
@ -7,7 +7,7 @@ export APP_SETTINGS=fittrackee.config.DevelopmentConfig
|
|||||||
export APP_SECRET_KEY='just for test'
|
export APP_SECRET_KEY='just for test'
|
||||||
# export APP_WORKERS=
|
# export APP_WORKERS=
|
||||||
export APP_LOG=fittrackee.log
|
export APP_LOG=fittrackee.log
|
||||||
export UPLOAD_FOLDER=/uploads
|
export UPLOAD_FOLDER=/usr/src/app/uploads
|
||||||
|
|
||||||
# Database
|
# Database
|
||||||
export DATABASE_URL=postgresql://fittrackee:fittrackee@fittrackee-db:5432/fittrackee
|
export DATABASE_URL=postgresql://fittrackee:fittrackee@fittrackee-db:5432/fittrackee
|
||||||
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -45,3 +45,6 @@ yarn-error.log*
|
|||||||
###############
|
###############
|
||||||
*.log
|
*.log
|
||||||
nohup.out
|
nohup.out
|
||||||
|
|
||||||
|
# docker
|
||||||
|
data
|
||||||
|
2
Makefile
2
Makefile
@ -53,7 +53,7 @@ docker-run-workers:
|
|||||||
docker-compose -f docker-compose-dev.yml exec -d fittrackee docker/run-workers.sh
|
docker-compose -f docker-compose-dev.yml exec -d fittrackee docker/run-workers.sh
|
||||||
|
|
||||||
docker-serve-client:
|
docker-serve-client:
|
||||||
docker-compose -f docker-compose-dev.yml up fittrackee_client -d
|
docker-compose -f docker-compose-dev.yml up -d fittrackee_client
|
||||||
docker-compose -f docker-compose-dev.yml exec fittrackee_client react-scripts start
|
docker-compose -f docker-compose-dev.yml exec fittrackee_client react-scripts start
|
||||||
|
|
||||||
docker-shell:
|
docker-shell:
|
||||||
|
@ -10,6 +10,8 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- POSTGRES_USER=postgres
|
- POSTGRES_USER=postgres
|
||||||
- POSTGRES_PASSWORD=postgres
|
- POSTGRES_PASSWORD=postgres
|
||||||
|
volumes:
|
||||||
|
- ./data/db:/var/lib/postgresql/data
|
||||||
|
|
||||||
fittrackee:
|
fittrackee:
|
||||||
container_name: fittrackee
|
container_name: fittrackee
|
||||||
@ -28,13 +30,14 @@ services:
|
|||||||
- mail
|
- mail
|
||||||
volumes:
|
volumes:
|
||||||
- .:/usr/src/app
|
- .:/usr/src/app
|
||||||
- fittrackee_upload:/uploads:rw
|
- ./data/workouts:/usr/src/app/workouts
|
||||||
|
- ./data/uploads:/usr/src/app/uploads
|
||||||
|
|
||||||
fittrackee_client:
|
fittrackee_client:
|
||||||
container_name: fittrackee_client
|
container_name: fittrackee_client
|
||||||
environment:
|
environment:
|
||||||
- NODE_ENV=development
|
- NODE_ENV=development
|
||||||
- REACT_APP_API_URL=http://0.0.0.0:5000
|
- REACT_APP_API_URL=http://localhost:5000
|
||||||
build:
|
build:
|
||||||
context: ./fittrackee_client
|
context: ./fittrackee_client
|
||||||
volumes:
|
volumes:
|
||||||
@ -61,6 +64,3 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "1025:1025"
|
- "1025:1025"
|
||||||
- "8025:8025"
|
- "8025:8025"
|
||||||
|
|
||||||
volumes:
|
|
||||||
fittrackee_upload:
|
|
Loading…
Reference in New Issue
Block a user