From 73ba628669fd4300a394bfcc1dcf25cc54feed35 Mon Sep 17 00:00:00 2001
From: otthorn <otthorn@docker-ovh.adm.auro.re>
Date: Thu, 24 Sep 2020 18:11:27 +0200
Subject: [PATCH] desactivate the CAS due to render on wrong URIs

---
 codimd/Dockerfile                  |  2 +-
 docker-compose.yml                 | 68 +++++++++++++++---------------
 etherpad/Dockerfile                |  2 +-
 grafana/Dockerfile                 |  2 +-
 prometheus-alertmanager/Dockerfile |  2 +-
 riot/Dockerfile                    |  2 +-
 sharelatex/Dockerfile              |  2 +-
 7 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/codimd/Dockerfile b/codimd/Dockerfile
index 6debbe7..d3efb27 100644
--- a/codimd/Dockerfile
+++ b/codimd/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/codimd/server:1.5.0
+FROM quay.io/codimd/server:1.6.0-alpine
 
 ENV DEBUG=false
 ENV CMD_DB_URL=postgres://codimd:codimdpass@postgres:5432/codimd
diff --git a/docker-compose.yml b/docker-compose.yml
index e6bcc23..4972636 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,16 +7,16 @@ services:
   ##################################################
 
   mongo:
-      image: mongo
-      restart: always
-      volumes:
-          - ./mongo_data:/data/db
+    image: mongo:4.2
+    restart: always
+    volumes:
+      - ./mongo_data:/data/db
 
   redis:
-      image: redis
-      restart: always
-      volumes:
-          - ./redis_data:/data
+    image: redis:5.0
+    restart: always
+    volumes:
+      - ./redis_data:/data
 
   riot:
     build: riot
@@ -25,7 +25,7 @@ services:
       - 8080:80
 
   privatebin:
-    image: privatebin/nginx-fpm-alpine
+    image: privatebin/nginx-fpm-alpine:1.3.4
     restart: always
     volumes:
       - ./privatebin_data:/srv/data
@@ -39,6 +39,8 @@ services:
       - "POSTGRES_PASSWORD=${ETHERPAD_POSTGRES_PASSWD}"
     ports:
       - 8084:9001
+    depends_on:
+      - postgres
 
   grafana:
     build: grafana
@@ -51,7 +53,7 @@ services:
       - 8082:3000
 
   matrix-appservice-discord:
-    image: halfshot/matrix-appservice-discord
+    image: halfshot/matrix-appservice-discord:latest
     restart: always
     volumes:
       - ./matrix-appservice-discord_data:/data
@@ -96,27 +98,27 @@ services:
     depends_on:
       - postgres
 
-  cas:
-    build: django-cas-server
-    restart: always
-    environment:
-      DJANGO_DB_PASSWORD: "${DJANGO_CAS_DB_PASSWORD}"
-      DJANGO_SECRET_KEY: "${DJANGO_CAS_SECRET_KEY}"
-      DJANGO_CAS_LDAP_PASSWORD: "${DJANGO_CAS_LDAP_PASSWORD}"
-    ports:
-      - "8085:8000"
-    depends_on:
-      - postgres
+#  cas:
+#    build: django-cas-server
+#    restart: always
+#    environment:
+#      DJANGO_DB_PASSWORD: "${DJANGO_CAS_DB_PASSWORD}"
+#      DJANGO_SECRET_KEY: "${DJANGO_CAS_SECRET_KEY}"
+#      DJANGO_CAS_LDAP_PASSWORD: "${DJANGO_CAS_LDAP_PASSWORD}"
+#    ports:
+#      - "8085:8000"
+#    depends_on:
+#      - postgres
 
-  sharelatex:
-    build: sharelatex
-    restart: always
-    volumes:
-      - ./sharelatex_data:/var/lib/sharelatex
-      - /var/run/docker.sock:/var/run/docker.sock
-    privileged: true
-    ports:
-      - "8086:8000"
-    depends_on:
-      - mongo
-      - redis
+#  sharelatex:
+#    build: sharelatex
+#    restart: always
+#    volumes:
+#      - ./sharelatex_data:/var/lib/sharelatex
+#      - /var/run/docker.sock:/var/run/docker.sock
+#    privileged: true
+#    ports:
+#      - "8086:8000"
+#    depends_on:
+#      - mongo
+#      - redis
diff --git a/etherpad/Dockerfile b/etherpad/Dockerfile
index cba6fe7..fdef152 100644
--- a/etherpad/Dockerfile
+++ b/etherpad/Dockerfile
@@ -1,4 +1,4 @@
-FROM etherpad/etherpad
+FROM etherpad/etherpad:1.8.0
 
 # Change instance settings
 ENV NODE_ENV=production
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
index d83025b..5609487 100644
--- a/grafana/Dockerfile
+++ b/grafana/Dockerfile
@@ -1,4 +1,4 @@
-FROM grafana/grafana
+FROM grafana/grafana:6.7.2
 
 ENV GF_SERVER_ROOT_URL=https://grafana.auro.re
 ENV GF_SESSION_COOKIE_SECURE=true
diff --git a/prometheus-alertmanager/Dockerfile b/prometheus-alertmanager/Dockerfile
index 03dcac5..f3278ee 100644
--- a/prometheus-alertmanager/Dockerfile
+++ b/prometheus-alertmanager/Dockerfile
@@ -1,3 +1,3 @@
-FROM prom/alertmanager
+FROM prom/alertmanager:v0.20.0
 
 COPY alertmanager.yml /etc/alertmanager/alertmanager.yml
diff --git a/riot/Dockerfile b/riot/Dockerfile
index bdbf29b..54aae05 100644
--- a/riot/Dockerfile
+++ b/riot/Dockerfile
@@ -1,4 +1,4 @@
-FROM vectorim/riot-web
+FROM vectorim/riot-web:v1.5.15
 
 # Customize instance settings and background
 COPY config.json /app/config.json
diff --git a/sharelatex/Dockerfile b/sharelatex/Dockerfile
index ef60e4e..c2b313c 100644
--- a/sharelatex/Dockerfile
+++ b/sharelatex/Dockerfile
@@ -1,4 +1,4 @@
-FROM sharelatex/sharelatex
+FROM sharelatex/sharelatex:2.2.0
 
 ENV SHARELATEX_APP_NAME="ShareLaTeX Aurore"
 ENV SHARELATEX_MONGO_URL=mongodb://mongo/sharelatex