Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions backend/Dockerfile → backend/Dockerfile.api
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
FROM node:14.11.0 AS development

FROM node:14.11.0 AS api-development
RUN mkdir /srv/backend && chown node:node /srv/backend

WORKDIR /srv/backend

USER node

COPY --chown=node:node package.json yarn.lock ./

RUN yarn install --silent

RUN mkdir -p node_modules

FROM node:14.11.0-slim AS production

FROM node:14.11.0-slim AS api-production
EXPOSE 4000
USER node

WORKDIR /srv/backend

COPY --from=development --chown=root:root /srv/backend/node_modules ./node_modules

COPY --from=api-development /srv/backend/node_modules ./node_modules
COPY . .
CMD ["npm", "run", "dev"]

27 changes: 0 additions & 27 deletions client/Dockerfile

This file was deleted.

21 changes: 21 additions & 0 deletions client/Dockerfile.client
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM node:14.11.0 AS client-development
RUN mkdir /srv/client && chown node:node /srv/client
WORKDIR /srv/client
USER node
RUN mkdir -p node_modules
COPY --chown=node:node package.json yarn.lock ./
RUN yarn install --silent

FROM node:14.11.0-slim AS client-builder
USER node
WORKDIR /srv/client
COPY --from=client-development /srv/client/node_modules node_modules
COPY . .
USER root
RUN npm run build

FROM nginx as client-production
EXPOSE 3000
COPY /nginx/default.conf /etc/nginx/conf.d/default.conf
COPY --from=client-builder /srv/client/build /usr/share/nginx/html/
CMD ["nginx", "-g", "daemon off;"]
9 changes: 9 additions & 0 deletions client/nginx/default.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
server {

listen 3000;
location / {
root /usr/share/nginx/html;
index index.html index.htm;
try_files $uri $uri/ /index.html;
}
}
6 changes: 4 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ services:
backend:
build:
context: ./backend
target: development
dockerfile: Dockerfile.api
target: api-development
command: yarn run dev
volumes:
- ./backend:/srv/backend
Expand All @@ -22,7 +23,8 @@ services:
client:
build:
context: ./client
target: development
dockerfile: Dockerfile.client
target: client-development
command: yarn run start
volumes:
- ./client:/srv/client
Expand Down