diff --git a/Dockerfile b/Dockerfile index ba72fd78e724ed27ea8bf4a58160659e30760b66..67b03d4f030be4439c5dfce0b5076d6b80a32c53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,12 @@ FROM debian:stable as builder RUN apt-get update && apt-get install -y npm git -COPY . /opt +RUN node -v +COPY mirador-annotations/ /opt WORKDIR /opt -RUN npm ci -RUN npm run build -FROM caddy:latest as httpd -COPY --from=builder /opt/public /srv +RUN pwd +RUN npm install +# start app +RUN pwd +CMD ["npm", "start"] diff --git a/docker-compose.yml b/docker-compose.yml index 7b8770da07ceefb2c51e4eddb35c023b87767cbd..b4c3da416060e05874f9bd9f06362a182db13a35 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,15 +1,11 @@ version: "3.3" services: - httpd: + web: build: . - restart: $RESTART + ports: + - ${DEV_PORT}:3000 environment: - CORS_ALLOWED_HOSTS - - WEBPACK_MODE=production - volumes: - - $HTTP_FOLDER:/srv/data - - ./Caddyfile:/etc/caddy/Caddyfile - annotot: image: tetraslibre/annotot-app environment: