X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=docker%2FDockerfile;h=baef3220648d1643421afee14539079a8b2aa7e2;hb=452a4864d4a8d0286ddd351958d8cc02574b4ba9;hp=1921770c551c1915a4d20f681bcc64af2097c7f9;hpb=653b69b42ae1e4bb1aec29dcb5e901ab3f83fada;p=e-mobility-charging-stations-simulator.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1921770c..baef3220 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,29 +1,22 @@
-FROM node:lts-alpine as builder
+FROM node:lts-alpine AS builder
 
-# Build simulator
+# Build simulator and dashboard
 WORKDIR /usr/builder
-COPY .npmrc package.json package-lock.json tsconfig.json rollup.config.mjs prepare.js build-requirements.mjs ./
-COPY src ./src
-COPY docker/config.json ./src/assets/config.json
-COPY docker/authorization-tags.json ./src/assets/authorization-tags.json
+COPY . ./
 RUN set -ex \
   && apk add --no-cache --virtual .gyp build-base python3 \
-  && npm set progress=false \
-  && npm config set depth 0 \
-  && npm cache clean --force \
-  && npm clean-install \
-  && npm run build \
-  && apk del .gyp
-
-# Build simulator dashboard
-WORKDIR /usr/builder/webui
-COPY ui/web ./
-RUN set -ex \
-  && npm set progress=false \
-  && npm config set depth 0 \
-  && npm cache clean --force \
-  && npm clean-install \
-  && npm run build
+  && corepack enable \
+  && corepack prepare pnpm@latest --activate \
+  && pnpm set progress=false \
+  && pnpm config set depth 0 \
+  && pnpm install --ignore-scripts --frozen-lockfile \
+  && cp docker/config.json src/assets/config.json \
+  && cp docker/idtags.json src/assets/idtags.json \
+  && pnpm build \
+  && apk del .gyp \
+  && cd ui/web \
+  && cp src/assets/config-template.json public/config.json \
+  && pnpm build
 
 FROM node:lts-alpine
 
@@ -33,10 +26,10 @@ ARG MAX_OLD_SPACE_SIZE=768
 ENV NODE_OPTIONS="--stack-trace-limit=${STACK_TRACE_LIMIT} --max-old-space-size=${MAX_OLD_SPACE_SIZE}"
 
 WORKDIR /usr/app
-COPY --from=builder /usr/builder/webui ./webui
+COPY --from=builder /usr/builder/ui/web ./ui/web
 COPY --from=builder /usr/builder/node_modules ./node_modules
 COPY --from=builder /usr/builder/dist ./dist
-COPY README.md LICENSE ./
+COPY package.json README.md LICENSE ./
 COPY docker/start.sh /start.sh
 COPY docker/autoconfig.sh /autoconfig.sh
 RUN set -ex \