From a00339395c053437fba481262300c158460124e0 Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Wed, 1 Mar 2023 09:50:01 +0100
Subject: [PATCH] Remove build of prod and switch back to NPM
---
Dockerfile | 10 ++++++----
dev.yml | 6 +-----
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 6601e5c..1106b69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,9 +5,11 @@ RUN chown -R node:node /opt
EXPOSE 9000
WORKDIR /opt
USER node
-RUN yarn install
-RUN yarn run build
-CMD yarn run serve
+CMD npm run serve
+
+FROM mirador as builder
+RUN npm install
+RUN npm run build
FROM caddy:latest as httpd
-COPY --from=mirador /opt/public /srv
+COPY --from=builder /opt/public /srv
diff --git a/dev.yml b/dev.yml
index b339f24..fd7dfa4 100644
--- a/dev.yml
+++ b/dev.yml
@@ -1,6 +1,6 @@
version: "3.3"
services:
- devserver:
+ httpd:
build:
context: .
target: mirador
@@ -15,10 +15,6 @@ services:
volumes:
- ./:/opt
- httpd:
- ports:
- - $PORT:80
-
annotot:
ports:
- ${ANNOTOT_PORT}:3000
--
GitLab