Use a unified docker-compose file

grafana/Dockerfile

@@ -0,0 +1,14 @@
+FROM grafana/grafana
+
+ENV GF_SERVER_ROOT_URL=https://grafana.auro.re
+ENV GF_SESSION_COOKIE_SECURE=true
+ENV GF_ANALYTICS_REPORTING_ENABLED=false
+ENV GF_SNAPSHOTS_EXTERNAL_ENABLED=false
+ENV GF_USERS_ALLOW_SIGN_UP=false
+ENV GF_USERS_ALLOW_ORG_CREATE=false
+ENV GF_AUTH_BASIC_ENABLED=false
+ENV GF_AUTH_LDAP_ENABLED=true
+ENV GF_AUTH_LDAP_CONFIG_FILE=/etc/grafana/ldap.toml
+
+COPY ldap.toml /etc/grafana/ldap.toml
+

grafana/docker-compose.yml

@@ -1,29 +0,0 @@
-# For the moment, the LDAP password need to be in ldap.toml
-# In the future, we will be able to make a secret
-# See https://github.com/grafana/grafana/pull/17526
-
-version: "3.7"
-
-services:
-  grafana:
-    image: grafana/grafana
-    environment:
-      - GF_SERVER_ROOT_URL=https://grafana.auro.re
-      - GF_SESSION_COOKIE_SECURE=true
-      - GF_ANALYTICS_REPORTING_ENABLED=false
-      - GF_SNAPSHOTS_EXTERNAL_ENABLED=false
-      - GF_USERS_ALLOW_SIGN_UP=false
-      - GF_USERS_ALLOW_ORG_CREATE=false
-      - GF_AUTH_BASIC_ENABLED=false
-      - GF_AUTH_LDAP_ENABLED=true
-      - GF_AUTH_LDAP_CONFIG_FILE=/etc/grafana/ldap.toml
-
-      # Install Grafana plugins at startup
-      - GF_INSTALL_PLUGINS=grafana-worldmap-panel
-    volumes:
-      - ./data_grafana:/var/lib/grafana
-      - ./ldap.toml:/etc/grafana/ldap.toml:ro
-    ports:
-      - 8082:3000
-    restart: always
-

grafana/ldap.toml

@@ -23,7 +23,7 @@ ssl_skip_verify = false
 bind_dn = "cn=grafana,ou=service-users,dc=auro,dc=re"
 # Search user bind password
 # If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
-bind_password = 'CHANGE ME IN PRODUCTION, I WILL DIFFER !'
+bind_password = '${ENV_PASSWORD}'
 
 # User search filter, for example "(cn=%s)" or "(sAMAccountName=%s)" or "(uid=%s)"
 search_filter = "(cn=%s)"
@@ -50,7 +50,7 @@ email =  "mail"
 group_dn = "cn=sudoldap,ou=posix,ou=groups,dc=auro,dc=re"
 org_role = "Admin"
 # To make user an instance admin  (Grafana Admin) uncomment line below
-grafana_admin = true
+# grafana_admin = true
 # The Grafana organization database id, optional, if left out the default org (id 1) will be used
 # org_id = 1