Skip to content

Commit c42817e

Browse files
author
Tik
committed
added docker_development.env for developer to specify environment variables
1 parent ede5276 commit c42817e

2 files changed

Lines changed: 22 additions & 19 deletions

File tree

docker/docker-compose.yaml

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ services:
88
container_name: pydggsapi_developement
99
ports:
1010
- "8080:8000"
11+
env_file: "docker_development.env"
1112
volumes:
1213
- dggs_api_config:/opt/local/src/pydggsapi/config
13-
- test_data:/opt/local/src/pydggsapi/testing_data
14+
- pydggsapi_datasets:/opt/local/src/pydggsapi/testing_data
1415
develop:
1516
watch:
1617
- action: sync
17-
path: <abs path to the developement source files>
18+
path: /home/github_repo/pydggsapi/pydggsapi
1819
target: /opt/local/src/pydggsapi/pydggsapi
1920
command: [
2021
"sh", "-c",
@@ -33,36 +34,37 @@ services:
3334
profiles:
3435
- testing
3536
build:
36-
context: .
37-
dockerfile: Dockerfile.dev
38-
container_name: integration_tests
39-
environment:
40-
- NODE_ENV=testing
41-
- API_URL=http://api:8080
42-
command: npm run test:integration
37+
context: ../
38+
dockerfile: ./docker/Dockerfile
39+
container_name: pydggsapi_pytest
40+
command: [ "pytest", "/test"
41+
]
4342
volumes:
44-
- .:/app
45-
- /app/node_modules
46-
depends_on:
47-
api:
48-
condition: service_started
43+
- pytest_path:/opt/local/src/pydggsapi/tests
44+
4945

5046
volumes:
47+
pydggsapi_source_path:
48+
driver: local
49+
driver_opts:
50+
type: none
51+
o: bind
52+
device: /home/github_repo/pydggsapi/pydggsapi
5153
dggs_api_config:
5254
driver: local
5355
driver_opts:
5456
type: none
5557
o: bind
56-
device: <path to DGGS_API_CONFIG file>
57-
test_data:
58+
device: /home/github_repo/pydggsapi/dev/config
59+
pydggsapi_datasets:
5860
driver: local
5961
driver_opts:
6062
type: none
6163
o: bind
62-
device: <path to Collections>
64+
device: /home/github_repo/pydggsapi/dev/datasets
6365
pytest_testcases:
6466
driver: local
65-
driver_opts:
67+
driver_opts:
6668
type: none
6769
o: bind
68-
device: <path to pytest>
70+
device: /home/github_repo/pydggsapi/dev/tests

docker/docker_development.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DGGS_API_CONFIG=/opt/local/src/pydggsapi/config/pydggsapi-config.json

0 commit comments

Comments
 (0)