Merge pull request #101 from Fmstrat/dev_docker

Docker updates for full files
This commit is contained in:
Sam 2021-10-18 20:46:11 +02:00 committed by GitHub
commit 854f595425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 9 deletions

View File

@ -8,4 +8,5 @@
.eslintcache
docker-compose-dev.yml
Makefile.custom.config
*.log
*.log
data

View File

@ -7,7 +7,7 @@ export APP_SETTINGS=fittrackee.config.DevelopmentConfig
export APP_SECRET_KEY='just for test'
# export APP_WORKERS=
export APP_LOG=fittrackee.log
export UPLOAD_FOLDER=/uploads
export UPLOAD_FOLDER=/usr/src/app/uploads
# Database
export DATABASE_URL=postgresql://fittrackee:fittrackee@fittrackee-db:5432/fittrackee

3
.gitignore vendored
View File

@ -45,3 +45,6 @@ yarn-error.log*
###############
*.log
nohup.out
# docker
data

View File

@ -53,7 +53,7 @@ docker-run-workers:
docker-compose -f docker-compose-dev.yml exec -d fittrackee docker/run-workers.sh
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-shell:

View File

@ -10,7 +10,9 @@ services:
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
volumes:
- ./data/db:/var/lib/postgresql/data
fittrackee:
container_name: fittrackee
build: .
@ -28,13 +30,14 @@ services:
- mail
volumes:
- .:/usr/src/app
- fittrackee_upload:/uploads:rw
- ./data/workouts:/usr/src/app/workouts
- ./data/uploads:/usr/src/app/uploads
fittrackee_client:
container_name: fittrackee_client
environment:
- NODE_ENV=development
- REACT_APP_API_URL=http://0.0.0.0:5000
- REACT_APP_API_URL=http://localhost:5000
build:
context: ./fittrackee_client
volumes:
@ -61,6 +64,3 @@ services:
ports:
- "1025:1025"
- "8025:8025"
volumes:
fittrackee_upload: