Merge pull request #135 from cznethub/move-env

read .env file from parent dsp repo

.github/workflows/test_coverage.yml

@@ -17,6 +17,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Download default .env file
+      run: make default-env
+
     - name: Build containers
       run: make build
 

.gitignore

@@ -7,3 +7,4 @@ db-data
 .coverage
 htmlcov/
 dspback/schemas/*/model.py
+.env

Dockerfile-dev

@@ -4,7 +4,6 @@ WORKDIR /dspback
 
 COPY requirements.txt requirements.txt
 COPY requirements-dev.txt requirements-dev.txt
-COPY .env .env
 
 RUN pip install -r requirements.txt
 RUN pip install -r requirements-dev.txt

Makefile

@@ -25,6 +25,10 @@ test-cov:
 test-cov-gh-action:
 	docker exec dsp_dev_dspback pytest tests --cov=dspback --cache-clear > pytest-coverage.txt
 
+.PHONY: default-env
+default-env:
+	wget -N https://raw.githubusercontent.com/cznethub/dsp/develop/.env
+
 .PHONY: up
 up:
 	docker-compose --env-file .env up dspback database

docker-compose.yml

@@ -5,6 +5,8 @@ services:
   dspfront:
     image: dspfront
     container_name: dsp_dev_dspfront
+    volumes:
+      - ./../.env:/dspfront/.env
     ports:
       - 5001:5001
     restart: unless-stopped