diff --git a/deploy/Makefile b/deploy/Makefile index a70c33a..496a95f 100644 --- a/deploy/Makefile +++ b/deploy/Makefile @@ -12,7 +12,7 @@ endif build-image : docker build -t $(ORGANIZATION)/$(CONTAINER):$(VERSION) . -deploy : +run : docker run --rm --name $(CONTAINER) \ --env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \ --env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \ diff --git a/docker-compose.yml b/docker-compose.yml index a4acf52..73d0ca6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,9 +33,11 @@ services: - postgres volumes: - ./services/backend/src:/home/server/ + - ./services/backend/configs:/home/configs/ - django-static:/static/ ports: - "9001:9001" + - "9000:9000" environment: - DB_REMOTE=False - APP_URL= @@ -47,15 +49,8 @@ services: context: ./ dockerfile: ./services/frontend/Dockerfile image: corpulent/ctk-frontend:1.0.0 - depends_on: - - backend - links: - - backend volumes: - - ./services/frontend/configs/nginx/uwsgi_params:/home/config/uwsgi/uwsgi_params - - ./services/frontend/configs/nginx/localhost.conf:/etc/nginx/conf.d/default.conf - - ./services/frontend/configs/nginx/nginx.conf:/etc/nginx/nginx.conf + - ./services/frontend/configs/nginx/default.conf:/etc/nginx/conf.d/default.conf - ./services/frontend/build:/usr/share/nginx/html/ - - django-static:/home/server/static/ ports: - - "80:80" + - "8080:8080"