Skip to content

Commit 7041104

Browse files
committed
Fix quickstart npm install; update docker-compose test
1 parent 4196c7b commit 7041104

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

dev-quickstart.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ cd graphql_django_apollo_starter
99
cp client/.env.example client/.env
1010
cp .env.example .env
1111
docker-compose down -v; docker-compose build; docker-compose up -d
12+
cd client
1213
npm install

{{ cookiecutter.project_slug }}/docker-compose.test.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ services:
1010
volumes:
1111
- ./client:/app
1212
- /app/node_modules
13-
- ./server/schema:/app/schema # Need to keep schema up to date based off of server
1413
- /app/build
1514
- /app/public
15+
- schema-test:/app/schema # Need to keep schema up to date based off of server
1616
- /app/src/generated/ # Don't want to overwrite what's generated via
1717
# the non-test environment.
1818
depends_on:
@@ -41,8 +41,7 @@ services:
4141
- redis
4242
volumes:
4343
- ./server:/app
44-
- /app/schema/ # Don't want to overwrite what's generated via
45-
# the non-test environment.
44+
- schema-test:/app/schema # Need to keep schema up to date based off of server
4645
env_file:
4746
- ./server/.env
4847
environment:
@@ -51,6 +50,7 @@ services:
5150
DJANGO_CORS_ORIGIN_WHITELIST: http://localhost:8081,http://client-test:8080
5251
DJANGO_TRUSTED_ORIGINS: http://localhost:8081,http://client-test:8080
5352
DJANGO_DISABLE_CSRF: 'True'
53+
GIT_SHA: '0123456789'
5454
tty: true
5555
stdin_open: true
5656
ports:
@@ -67,3 +67,6 @@ services:
6767
working_dir: /e2e
6868
volumes:
6969
- ./e2e:/e2e
70+
71+
volumes:
72+
schema-test:

0 commit comments

Comments
 (0)