Improves deploy (#85)

.gitignore

@@ -92,6 +92,7 @@ celerybeat.pid
 
 # Environments
 .env
+.gen.env
 .venv
 env/
 venv/

Makefile

@@ -2,14 +2,12 @@
 	help
 	lock-deps
 	shell
-	lint
 	autotests
+	lint
+	build
+	envfile
 	runserver
 	runserver-uvicorn
-	build
-	push
-	pull
-	deploy
 
 .DEFAULT_GOAL := help
 
@@ -61,7 +59,10 @@ build:  ## Build docker image
 		--project-directory . \
 		build parrot-app
 
-runserver:  ## Local startup the app on docker with required services
+envfile:  ## Generate env file with variables with prefix PARROT_
+	env | egrep ^PARROT_ > .gen.env
+
+runserver:  envfile  ## Local startup the app on docker with required services
 	docker-compose \
 		-f deploy/docker-compose.yml \
 		-f deploy/docker-compose.db.yml \
@@ -70,7 +71,7 @@ runserver:  ## Local startup the app on docker with required services
 		--project-directory . \
 		up
 
-runserver-uvicorn:  ## Local startup the app on docker with uvicorn
+runserver-uvicorn:  envfile  ## Local startup the app on docker with uvicorn
 	docker-compose \
 		-f deploy/docker-compose.yml \
 		-f deploy/docker-compose.db.yml \

deploy/docker-compose.db.yml

@@ -7,7 +7,7 @@ services:
       - "parrot-database"
 
   parrot-database:
-    image: hub.zxz.su/common/doci/postgres:12.3-05045d0f
+    image: postgres:12.3
     restart: unless-stopped
     container_name: parrot-database
     environment:

deploy/docker-compose.yml

@@ -1,11 +1,6 @@
 version: "3.8"
 
-x-default-env: &default-env
-  environment:
-    - DEBUG
-
 x-service-base: &service-base
-  <<: *default-env
   image: umahighload/parrot-app:latest
   restart: unless-stopped
 
@@ -16,7 +11,9 @@ services:
     build:
       context: .
       dockerfile: ./deploy/app/Dockerfile
+    env_file:
+      - .gen.env
     ports:
-    - "8042:8042"
+      - "8042:8042"
     container_name: parrot-app
     command: bash /app/start-django-uvicorn.sh