Commit 25aecbba authored by Philipp Rummelsberger's avatar Philipp Rummelsberger

.

parent a6064a59
......@@ -12,6 +12,6 @@ RUN npm install @angular/cli -g
RUN ng build foo --prod
FROM nginx
FROM nginx:alpine
COPY --from=build /app/build/dist/apps/foo /usr/share/nginx/html
......@@ -7,10 +7,6 @@ application:
to: docker/node/
# You could add some modules:
modules:
virtualenv:
class: virtualenv
base_path: .
python_bin: python2
docker:
docker_compose_config_overrides:
- localhost
......
......@@ -2,7 +2,8 @@ version: '3.2'
services:
web:
build: docker/node
image: node:10
working_dir: /app/web
tty: true
volumes:
- ../:/app:delegated
......@@ -13,7 +14,8 @@ services:
depends_on:
- api
api:
build: docker/node
image: node:10
working_dir: /app/web
tty: true
volumes:
- ../:/app:delegated
......
FROM node:10
<<<<<<< HEAD
WORKDIR /app/web
=======
WORKDIR web/app
>>>>>>> 25a4c6341ac53222c5912745cfb053f008521027
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment