From 8c7bd5b642a6e9269a0422b9560d375bffd224b5 Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Wed, 1 Mar 2023 02:01:29 +0100
Subject: [PATCH] Fix restart setting
---
Dockerfile | 6 +++---
annotations-plugin | 2 +-
docker-compose.yml | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 446fe58..6601e5c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,9 +5,9 @@ RUN chown -R node:node /opt
EXPOSE 9000
WORKDIR /opt
USER node
-RUN npm install
-RUN npm run build
-CMD npm run serve
+RUN yarn install
+RUN yarn run build
+CMD yarn run serve
FROM caddy:latest as httpd
COPY --from=mirador /opt/public /srv
diff --git a/annotations-plugin b/annotations-plugin
index a1e2371..a52f4ec 160000
--- a/annotations-plugin
+++ b/annotations-plugin
@@ -1 +1 @@
-Subproject commit a1e2371bcb8d4fa41e77767d70ea0e6052d586a0
+Subproject commit a52f4ec738ceeeff96aab7a369bf1cdc019e85c1
diff --git a/docker-compose.yml b/docker-compose.yml
index 34cfdc9..3a4fbec 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,7 @@ services:
context: .
dockerfile: Dockerfile
target: httpd
+ restart: $RESTART
environment:
- CORS_ALLOWED_HOSTS
- WEBPACK_MODE=production
--
GitLab