Skip to content

Commit 60be4f3

Browse files
committed
Let frontend tests talk to the backend
1 parent 517f458 commit 60be4f3

7 files changed

Lines changed: 1712 additions & 46 deletions

File tree

todo/Dockerfile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#
2-
# Backend for Development
2+
# Common Dependencies
33
#
4-
FROM node:12 AS development-backend
4+
FROM node:12 AS base
55

6-
RUN mkdir -p /srv/todo/backend &&\
7-
mkdir -p /srv/todo/storage &&\
8-
chown -R node:node /srv/todo
6+
RUN mkdir -p /srv/todo/storage && chown -R node:node /srv/todo
97

108
USER node
119

@@ -15,6 +13,13 @@ COPY --chown=node:node storage/package.json storage/package-lock.json ./
1513

1614
RUN npm install --quiet
1715

16+
#
17+
# Backend for Development
18+
#
19+
FROM base AS development-backend
20+
21+
RUN mkdir /srv/todo/backend
22+
1823
WORKDIR /srv/todo/backend
1924

2025
COPY --chown=node:node backend/package.json backend/package-lock.json ./
@@ -24,11 +29,9 @@ RUN npm install --quiet
2429
#
2530
# Frontend for Development
2631
#
27-
FROM node:12 AS development-frontend
32+
FROM base AS development-frontend
2833

29-
RUN mkdir -p /srv/todo/frontend/dist && chown -R node:node /srv/todo
30-
31-
USER node
34+
RUN mkdir /srv/todo/frontend
3235

3336
WORKDIR /srv/todo/frontend
3437

todo/docker-compose.test.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
version: '3.7'
2+
3+
services:
4+
frontend:
5+
environment:
6+
DATABASE_URL: postgres://postgres:postgres@postgres/test
7+
BASE_URL: http://backend:8080

todo/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ services:
3636
volumes:
3737
- ./frontend:/srv/todo/frontend
3838
- frontend_node_modules:/srv/todo/frontend/node_modules
39+
- ./storage:/srv/todo/storage
40+
- storage_node_modules:/srv/todo/storage/node_modules
3941

4042
# Use the node_modules volumes set up in the shared compose file.
4143
volumes:

0 commit comments

Comments
 (0)