From 6056f88ef94cb998041240c291157dc1e4fe2a0a Mon Sep 17 00:00:00 2001
From: Arthur de Moulins <arthurdemoulins@gmail.com>
Date: Tue, 5 Nov 2024 19:13:23 +0100
Subject: [PATCH] WIP

---
 dashboard/client/Dockerfile             | 12 ++++++++----
 dashboard/client/docker/start-server.sh |  5 ++---
 databox/client/Dockerfile               |  2 +-
 docker-compose.dev.yml                  |  4 ++--
 docker-compose.yml                      |  9 +++++++++
 expose/client/Dockerfile                |  2 +-
 lib/bash/configurator/get-config.sh     |  2 +-
 uploader/client/Dockerfile              |  2 +-
 8 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/dashboard/client/Dockerfile b/dashboard/client/Dockerfile
index a37a6f021..dde697261 100644
--- a/dashboard/client/Dockerfile
+++ b/dashboard/client/Dockerfile
@@ -17,13 +17,17 @@ RUN pnpm build
 
 ############
 
-FROM nginx:1.17.6-alpine AS client-nginx
+FROM nginx:1.27.1-alpine3.20 AS client-nginx
 
 COPY --from=client-build /srv/workspace/dashboard/client/dist /var/app
 COPY ./dashboard/client/docker/nginx/conf.d /etc/nginx/conf.d
 COPY ./dashboard/client/docker/start-server.sh /
 
-RUN apk add --no-cache libstdc++ \
+RUN apk update \
+    && apk add --no-cache \
+      libstdc++ \
+      curl \
+      openssl \
     && apk add --virtual .build \
         wget \
     && mkdir -p /var/docker \
@@ -37,10 +41,10 @@ EXPOSE 80
 ARG SENTRY_RELEASE
 ENV SENTRY_RELEASE=${SENTRY_RELEASE}
 
-COPY --chown=node:node ./lib/bash/configurator /var/app//configurator
-
 COPY ./dashboard/client/config-compiler.js /var/app/
 
+COPY ./lib/bash/configurator /var/app/configurator
+
 WORKDIR /var/app
 
 CMD ["/start-server.sh"]
diff --git a/dashboard/client/docker/start-server.sh b/dashboard/client/docker/start-server.sh
index 110e4b374..e420ccb84 100755
--- a/dashboard/client/docker/start-server.sh
+++ b/dashboard/client/docker/start-server.sh
@@ -1,10 +1,9 @@
 #!/bin/sh
 
 set -ex
-
-/var/app//configurator/get-config.sh
-
 echo 'OK'
 
+/var/app/configurator/get-config.sh
+
 #/var/docker/generate-env ./
 nginx -g 'daemon off;'
diff --git a/databox/client/Dockerfile b/databox/client/Dockerfile
index af6eb56ee..c930d9a63 100644
--- a/databox/client/Dockerfile
+++ b/databox/client/Dockerfile
@@ -17,7 +17,7 @@ RUN NODE_OPTIONS="--max-old-space-size=8192" && pnpm build
 
 ############
 
-FROM nginx:1.17.6-alpine AS client-nginx
+FROM nginx:1.27.1-alpine3.20 AS client-nginx
 
 COPY --from=client-build /srv/workspace/databox/client/dist /var/app
 COPY ./databox/client/docker/nginx/conf.d /etc/nginx/conf.d
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 9b0147d2a..1d5a3d28b 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -4,7 +4,6 @@ services:
   a_client:
     volumes:
       - ./lib/js:/srv/workspace/lib/js:rw
-      - ./lib/bash:/srv/workspace/lib/bash:rw
       - ./package.json:/srv/workspace/package.json:ro
       - ./pnpm-workspace.yaml:/srv/workspace/pnpm-workspace.yaml:ro
       - ./turbo.json:/srv/workspace/turbo.json:ro
@@ -15,10 +14,11 @@ services:
       service: a_client
     image: ${REGISTRY_NAMESPACE}dashboard-dev:${DOCKER_TAG}
     build:
-      target: client-nginx
+      target: client-build
     volumes:
       - ./dashboard/client:/srv/workspace/dashboard/client:rw
       - ./dashboard/client/docker/start-server.sh:/start-server.sh:rw
+      - ./lib/bash/configurator:/var/app/configurator:rw
     environment:
       - WDS_SOCKET_PORT=443
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 85bdc7557..fb03847dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -86,6 +86,14 @@ services:
       - MATOMO_URL
       - SENTRY_DSN=${CLIENT_SENTRY_DSN}
       - SENTRY_ENVIRONMENT
+      - S3_ENDPOINT
+      - S3_PATH_PREFIX
+      - S3_ACCESS_KEY
+      - S3_SECRET_KEY
+      - S3_REGION
+      - CONFIGURATOR_STORAGE_BUCKET_NAME
+      - CONFIGURATOR_STORAGE_USE_PATH_STYLE_ENDPOINT
+      - VERIFY_SSL
     volumes:
       - ./configs:/configs
     labels:
@@ -93,6 +101,7 @@ services:
       - "traefik.project_name=${COMPOSE_PROJECT_NAME}"
     extra_hosts:
       - soketi.${PHRASEA_DOMAIN}:${PS_GATEWAY_IP}
+      - minio.${PHRASEA_DOMAIN}:${PS_GATEWAY_IP}
 
   a_api-php:
     profiles:
diff --git a/expose/client/Dockerfile b/expose/client/Dockerfile
index e95f68ab4..4c58cdb19 100644
--- a/expose/client/Dockerfile
+++ b/expose/client/Dockerfile
@@ -17,7 +17,7 @@ RUN pnpm build
 
 ############
 
-FROM nginx:1.17.6-alpine AS client-nginx
+FROM nginx:1.27.1-alpine3.20 AS client-nginx
 
 COPY --from=client-build /srv/workspace/expose/client/dist /var/app
 COPY ./expose/client/docker/nginx/conf.d /etc/nginx/conf.d
diff --git a/lib/bash/configurator/get-config.sh b/lib/bash/configurator/get-config.sh
index 46d2559b9..405c32503 100755
--- a/lib/bash/configurator/get-config.sh
+++ b/lib/bash/configurator/get-config.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -ex
 
diff --git a/uploader/client/Dockerfile b/uploader/client/Dockerfile
index fe1d7abf1..66141d2d5 100644
--- a/uploader/client/Dockerfile
+++ b/uploader/client/Dockerfile
@@ -17,7 +17,7 @@ RUN pnpm build
 
 ############
 
-FROM nginx:1.17.6-alpine AS client-nginx
+FROM nginx:1.27.1-alpine3.20 AS client-nginx
 
 COPY --from=client-build /srv/workspace/uploader/client/dist /var/app
 COPY ./uploader/client/docker/nginx/conf.d /etc/nginx/conf.d