From 529030430299f787ce17cdfe944a1975cc529823 Mon Sep 17 00:00:00 2001
From: sbelondr <sbelondr@protonmail.com>
Date: Fri, 25 Oct 2024 16:23:20 +0200
Subject: [PATCH] update deprecated version

---
 citelibre-rendezvous/Dockerfile |  5 +++--
 docker-compose-test.yml         | 25 +++++++++++--------------
 elasticsearch/Dockerfile        |  2 +-
 keycloak/Dockerfile             | 22 +++++++++++-----------
 kibana/Dockerfile               |  6 +++---
 5 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/citelibre-rendezvous/Dockerfile b/citelibre-rendezvous/Dockerfile
index ad9aadc..5e9ab67 100644
--- a/citelibre-rendezvous/Dockerfile
+++ b/citelibre-rendezvous/Dockerfile
@@ -1,8 +1,8 @@
 ARG site=site-citelibre-rendezvous-1.0.9
 
 # build the site and assemble the webapp
-FROM lutece/builder as builder
-
+FROM lutece/builder AS builder
+ARG site
 WORKDIR /app
 ADD pom.xml /app/pom.xml
 ADD src /app/src
@@ -13,6 +13,7 @@ RUN cd target && mv $(ls *.war) ${site}.war
 
 # built tomcat
 FROM tomcat:9.0-jdk11
+ARG site
 
 RUN apt update && apt install -y haproxy
 
diff --git a/docker-compose-test.yml b/docker-compose-test.yml
index 037e414..795e209 100644
--- a/docker-compose-test.yml
+++ b/docker-compose-test.yml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   db:
     image: ${REPO}/db
@@ -60,7 +58,6 @@ services:
     depends_on:
       - db
 
-
   citelibre:
     image: ${REPO}/ihm
     container_name: rdv_citelibre
@@ -99,9 +96,9 @@ services:
     mem_limit: 1g
     depends_on:
       - elasticsearch
-        #volumes:
-        #  - ./kibana/kibana.yml:/usr/share/kibana/config/kibana.yml
-
+    # volumes:
+    #  - ./kibana/kibana.yml:/usr/share/kibana/config/kibana.yml
+   
   elasticsearch:
     image: ${REPO}/elasticsearch
     container_name: rdv_elasticsearch
@@ -116,12 +113,12 @@ services:
     ports:
       - 9200:9200
       - 9300:9300
-    volumes:
-      - type: volume
-        source: elasticsearch-data
-        target: /usr/share/elasticsearch/data
+    # volumes:
+    #   - type: volume
+    #     source: elasticsearch-data
+    #     target: /usr/share/elasticsearch/data
 
-volumes:
-  elasticsearch-data:
-  rendezvous-data:
-    #  solr-data:
+# volumes:
+  # elasticsearch-data:
+  # rendezvous-data:
+  # solr-data:
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index a418f67..0ff6810 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,6 +1,6 @@
 FROM elasticsearch:8.12.2
 
-COPY --chmod=+x init-user.sh /usr/local/bin/init-user.sh
+COPY --chmod=755 init-user.sh /usr/local/bin/init-user.sh
 EXPOSE 9200
 
 CMD ["/bin/bash", "-c", "/usr/local/bin/init-user.sh && /usr/local/bin/docker-entrypoint.sh"]
diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index d139f19..0177d1c 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -1,16 +1,16 @@
 FROM keycloak/keycloak:18.0.0
 
-env KEYCLOAK_USER=admin
-env KEYCLOAK_PASSWORD=admin1234
-env KEYCLOAK_LOGLEVEL=DEBUG 
-env ROOT_LOGLEVEL=DEBUG
-env DB_VENDOR=mysql
-env DB_ADDR=db
-env DB_PORT=3306
-env DB_DATABASE=keycloak
-env DB_USER=root
-env DB_PASSWORD=root
-env DB_SCHEMA=public
+ENV KEYCLOAK_USER=admin
+ENV KEYCLOAK_PASSWORD=admin1234
+ENV KEYCLOAK_LOGLEVEL=DEBUG 
+ENV ROOT_LOGLEVEL=DEBUG
+ENV DB_VENDOR=mysql
+ENV DB_ADDR=db
+ENV DB_PORT=3306
+ENV DB_DATABASE=keycloak
+ENV DB_USER=root
+ENV DB_PASSWORD=root
+ENV DB_SCHEMA=public
 
 ENV KC_DB=mariadb
 ENV KC_DB_URL=jdbc:mariadb://db:3306/keycloak
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 26d19c3..5e3add7 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,7 +1,7 @@
 FROM kibana:8.12.2
-COPY --chmod=+x script.sh /usr/share/kibana/script.sh
-COPY --chmod=+x export.ndjson /usr/share/kibana/export.ndjson
-COPY --chmod=+x kibana.yml /usr/share/kibana/config/kibana.yml
+COPY --chmod=755 script.sh /usr/share/kibana/script.sh
+COPY --chmod=755 export.ndjson /usr/share/kibana/export.ndjson
+COPY --chmod=755 kibana.yml /usr/share/kibana/config/kibana.yml
 EXPOSE 5601
 
 CMD ["/bin/bash", "-c", "/usr/share/kibana/script.sh"]