Skip to content

Commit

Permalink
update deprecated version
Browse files Browse the repository at this point in the history
  • Loading branch information
sbelondr committed Oct 25, 2024
1 parent a8a969f commit 5290304
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 31 deletions.
5 changes: 3 additions & 2 deletions citelibre-rendezvous/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down
25 changes: 11 additions & 14 deletions docker-compose-test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.5'

services:
db:
image: ${REPO}/db
Expand Down Expand Up @@ -60,7 +58,6 @@ services:
depends_on:
- db


citelibre:
image: ${REPO}/ihm
container_name: rdv_citelibre
Expand Down Expand Up @@ -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
Expand All @@ -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:
2 changes: 1 addition & 1 deletion elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
22 changes: 11 additions & 11 deletions keycloak/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions kibana/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]

0 comments on commit 5290304

Please sign in to comment.