database creditians

5 years ago · defeff68a4
parent 879f436c2a
commit defeff68a4
6 changed files with 319 additions and 172 deletions
--- a/db.env
+++ b/db.env
@ -0,0 +1 @@
+MYSQL_ROOT_PASSWORD=mrpassword
--- a/db.env~
+++ b/db.env~
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,193 +1,167 @@
 version: '3.3'

 services:
-
  redmine:
-
    build: ./redmine
-
-    #image: redmine
-
-    container_name: redmine
-
+    #container_name: redmine
    restart: always
-
    ports:
-
      - 8080:3000
-
    environment:
-
-      REDMINE_DB_MYSQL: mysql
-
-      REDMINE_DB_PASSWORD: example
-
+      REDMINE_DB_MYSQL: db
      REDMINE_SECRET_KEY_BASE: supersecretkey
-
-      REDMINE_PLUGINS_MIGRATE: 1
-
+      REDMINE_PLUGINS_MIGRATE: true
+    env_file:
+      - db.env      
    volumes:
-
    - /srv/docker/redmine/redmine_mysql:/usr/src/redmine/files
-
    - /srv/docker/redmine/redmine-logs:/var/log/redmine

-    - /srv/docker/redmine/plugins:/usr/src/redmine/plugins
-
  db:
-
-    #build: ./mysql
-
    image: mysql:5.7
-
-    container_name: mysql
-
+    #container_name: mysql
    restart: always
-
    environment:
-
-      MYSQL_ROOT_PASSWORD: example
-
      MYSQL_DATABASE: redmine
-
+    env_file:
+      - db.env        
    volumes:
-
    - /srv/docker/redmine/mysql:/var/lib/mysql

-  openldap:
-
-    #build: ./ldap
-
-    image: osixia/openldap:1.4.0
-
-    container_name: openldap
-
-    restart: always
-
-    environment:
-
-      LDAP_LOG_LEVEL: "0x380"
-
-      LDAP_ORGANISATION: "Example Inc."
-
-      LDAP_DOMAIN: "example.org"
-
-      LDAP_BASE_DN: ""
-
-      LDAP_ADMIN_PASSWORD: "admin"
-
-      LDAP_CONFIG_PASSWORD: "config"
-
-      LDAP_READONLY_USER: "false"
-
-      #LDAP_READONLY_USER_USERNAME: "readonly"
-
-      #LDAP_READONLY_USER_PASSWORD: "readonly"
-
-      LDAP_RFC2307BIS_SCHEMA: "false"
-
-      LDAP_BACKEND: "mdb"
-
-      LDAP_TLS: "true"
-
-      LDAP_TLS_CRT_FILENAME: "ldap.crt"
-
-      LDAP_TLS_KEY_FILENAME: "ldap.key"
-
-      LDAP_TLS_DH_PARAM_FILENAME: "dhparam.pem"
-
-      LDAP_TLS_CA_CRT_FILENAME: "ca.crt"
-
-      LDAP_TLS_ENFORCE: "false"
-
-      LDAP_TLS_CIPHER_SUITE: "SECURE256:+SECURE128:-VERS-TLS-ALL:+VERS-TLS1.2:-RSA:-DHE-DSS:-CAMELLIA-128-CBC:-CAMELLIA-256-CBC"
-
-      LDAP_TLS_VERIFY_CLIENT: "never"
-
-      LDAP_REPLICATION: "false"
-
-      #LDAP_REPLICATION_CONFIG_SYNCPROV: "binddn="cn=admin,cn=config" bindmethod=simple credentials=$$LDAP_CONFIG_PASSWORD searchbase="cn=config" type=refreshAndPersist retry="60 +" timeout=1 starttls=critical"
-
-      #LDAP_REPLICATION_DB_SYNCPROV: "binddn="cn=admin,$$LDAP_BASE_DN" bindmethod=simple credentials=$$LDAP_ADMIN_PASSWORD searchbase="$$LDAP_BASE_DN" type=refreshAndPersist interval=00:00:00:10 retry="60 +" timeout=1 starttls=critical"
-
-      #LDAP_REPLICATION_HOSTS: "#PYTHON2BASH:['ldap://ldap.example.org','ldap://ldap2.example.org']"
-
-      KEEP_EXISTING_CONFIG: "false"
-
-      LDAP_REMOVE_CONFIG_AFTER_SETUP: "true"
-
-      LDAP_SSL_HELPER_PREFIX: "ldap"
-
-    tty: true
-
-    stdin_open: true
-
-    volumes:
-
-      - /srv/docker/ldap/ldap:/var/lib/ldap
-
-      - /srv/docker/ldap/slap.d:/etc/ldap/slapd.d
-
-      - /srv/docker/ldap/certs:/container/service/slapd/assets/certs/
-
-    ports:
-
-      - "389:389"
-
-      - "636:636"
-
-    # For replication to work correctly, domainname and hostname must be
-
-    # set correctly so that "hostname"."domainname" equates to the
-
-    # fully-qualified domain name for the host.
-
-    domainname: "example.org"
-
-    hostname: "ldap-server"
-
-  phpldapadmin:
-
-    image: osixia/phpldapadmin:latest
-
-    container_name: phpldapadmin
-
-    restart: always
-
-    environment:
-
-      PHPLDAPADMIN_LDAP_HOSTS: "openldap"
-
-      PHPLDAPADMIN_HTTPS: "false"
-
-    ports:
-
-      - "8880:80"
-
-    depends_on:
-
-      - openldap
-
-  svn:
-
-    build: ./svn8
-
-    container_name: svn-server
-
-    restart: always
-
-    #ports:
-
-    #    - "80:80"
-
-    #    - "3690:3690"
-
-    #environment:
-
-    #    - SVN_REPONAME=test_repo
-
-    volumes:
-
-        - /srv/docker/svn:/svn
-
-        - /srv/docker/apache2/config:/config/apache
+#  openldap:
+#
+#    #build: ./ldap
+#
+#    image: osixia/openldap:1.4.0
+#
+#    container_name: openldap
+#
+#    restart: always
+#
+#    environment:
+#
+#      LDAP_LOG_LEVEL: "0x380"
+#
+#      LDAP_ORGANISATION: "Example Inc."
+#
+#      LDAP_DOMAIN: "example.org"
+#
+#      LDAP_BASE_DN: ""
+#
+#      LDAP_ADMIN_PASSWORD: "admin"
+#
+#      LDAP_CONFIG_PASSWORD: "config"
+#
+#      LDAP_READONLY_USER: "false"
+#
+#      #LDAP_READONLY_USER_USERNAME: "readonly"
+#
+#      #LDAP_READONLY_USER_PASSWORD: "readonly"
+#
+#      LDAP_RFC2307BIS_SCHEMA: "false"
+#
+#      LDAP_BACKEND: "mdb"
+#
+#      LDAP_TLS: "true"
+#
+#      LDAP_TLS_CRT_FILENAME: "ldap.crt"
+#
+#      LDAP_TLS_KEY_FILENAME: "ldap.key"
+#
+#      LDAP_TLS_DH_PARAM_FILENAME: "dhparam.pem"
+#
+#      LDAP_TLS_CA_CRT_FILENAME: "ca.crt"
+#
+#      LDAP_TLS_ENFORCE: "false"
+#
+#      LDAP_TLS_CIPHER_SUITE: "SECURE256:+SECURE128:-VERS-TLS-ALL:+VERS-TLS1.2:-RSA:-DHE-DSS:-CAMELLIA-128-CBC:-CAMELLIA-256-CBC"
+#
+#      LDAP_TLS_VERIFY_CLIENT: "never"
+#
+#      LDAP_REPLICATION: "false"
+#
+#      #LDAP_REPLICATION_CONFIG_SYNCPROV: "binddn="cn=admin,cn=config" bindmethod=simple credentials=$$LDAP_CONFIG_PASSWORD searchbase="cn=config" type=refreshAndPersist retry="60 +" timeout=1 starttls=critical"
+#
+#      #LDAP_REPLICATION_DB_SYNCPROV: "binddn="cn=admin,$$LDAP_BASE_DN" bindmethod=simple credentials=$$LDAP_ADMIN_PASSWORD searchbase="$$LDAP_BASE_DN" type=refreshAndPersist interval=00:00:00:10 retry="60 +" timeout=1 starttls=critical"
+#
+#      #LDAP_REPLICATION_HOSTS: "#PYTHON2BASH:['ldap://ldap.example.org','ldap://ldap2.example.org']"
+#
+#      KEEP_EXISTING_CONFIG: "false"
+#
+#      LDAP_REMOVE_CONFIG_AFTER_SETUP: "true"
+#
+#      LDAP_SSL_HELPER_PREFIX: "ldap"
+#
+#    tty: true
+#
+#    stdin_open: true
+#
+#    volumes:
+#
+#      - /srv/docker/ldap/ldap:/var/lib/ldap
+#
+#      - /srv/docker/ldap/slap.d:/etc/ldap/slapd.d
+#
+#      - /srv/docker/ldap/certs:/container/service/slapd/assets/certs/
+#
+#    ports:
+#
+#      - "389:389"
+#
+#      - "636:636"
+#
+#    # For replication to work correctly, domainname and hostname must be
+#
+#    # set correctly so that "hostname"."domainname" equates to the
+#
+#    # fully-qualified domain name for the host.
+#
+#    domainname: "example.org"
+#
+#    hostname: "ldap-server"
+#
+#  phpldapadmin:
+#
+#    image: osixia/phpldapadmin:latest
+#
+#    container_name: phpldapadmin
+#
+#    restart: always
+#
+#    environment:
+#
+#      PHPLDAPADMIN_LDAP_HOSTS: "openldap"
+#
+#      PHPLDAPADMIN_HTTPS: "false"
+#
+#    ports:
+#
+#      - "8880:80"
+#
+#    depends_on:
+#
+#      - openldap
+#
+#  svn:
+#
+#    build: ./svn8
+#
+#    container_name: svn-server
+#
+#    restart: always
+#
+#    #ports:
+#
+#    #    - "80:80"
+#
+#    #    - "3690:3690"
+#
+#    #environment:
+#
+#    #    - SVN_REPONAME=test_repo
+#
+#    volumes:
+#
+#        - /srv/docker/svn:/svn
+#
+#        - /srv/docker/apache2/config:/config/apache
--- a/docker-compose.yml~
+++ b/docker-compose.yml~
@ -0,0 +1,168 @@
+version: '3.3'
+
+services:
+  redmine:
+    build: ./redmine
+    #container_name: redmine
+    restart: always
+    ports:
+      - 8080:3000
+    environment:
+      REDMINE_DB_MYSQL: db
+      REDMINE_SECRET_KEY_BASE: supersecretkey
+      REDMINE_PLUGINS_MIGRATE: true
+    env_file:
+      - db.env      
+    volumes:
+    - /srv/docker/redmine/redmine_mysql:/usr/src/redmine/files
+    - /srv/docker/redmine/redmine-logs:/var/log/redmine
+    - /srv/docker/redmine/plugins:/usr/src/redmine/plugins
+
+  db:
+    image: mysql:5.7
+    #container_name: mysql
+    restart: always
+    environment:
+      MYSQL_DATABASE: redmine
+    env_file:
+      - db.env        
+    volumes:
+    - /srv/docker/redmine/mysql:/var/lib/mysql
+
+#  openldap:
+#
+#    #build: ./ldap
+#
+#    image: osixia/openldap:1.4.0
+#
+#    container_name: openldap
+#
+#    restart: always
+#
+#    environment:
+#
+#      LDAP_LOG_LEVEL: "0x380"
+#
+#      LDAP_ORGANISATION: "Example Inc."
+#
+#      LDAP_DOMAIN: "example.org"
+#
+#      LDAP_BASE_DN: ""
+#
+#      LDAP_ADMIN_PASSWORD: "admin"
+#
+#      LDAP_CONFIG_PASSWORD: "config"
+#
+#      LDAP_READONLY_USER: "false"
+#
+#      #LDAP_READONLY_USER_USERNAME: "readonly"
+#
+#      #LDAP_READONLY_USER_PASSWORD: "readonly"
+#
+#      LDAP_RFC2307BIS_SCHEMA: "false"
+#
+#      LDAP_BACKEND: "mdb"
+#
+#      LDAP_TLS: "true"
+#
+#      LDAP_TLS_CRT_FILENAME: "ldap.crt"
+#
+#      LDAP_TLS_KEY_FILENAME: "ldap.key"
+#
+#      LDAP_TLS_DH_PARAM_FILENAME: "dhparam.pem"
+#
+#      LDAP_TLS_CA_CRT_FILENAME: "ca.crt"
+#
+#      LDAP_TLS_ENFORCE: "false"
+#
+#      LDAP_TLS_CIPHER_SUITE: "SECURE256:+SECURE128:-VERS-TLS-ALL:+VERS-TLS1.2:-RSA:-DHE-DSS:-CAMELLIA-128-CBC:-CAMELLIA-256-CBC"
+#
+#      LDAP_TLS_VERIFY_CLIENT: "never"
+#
+#      LDAP_REPLICATION: "false"
+#
+#      #LDAP_REPLICATION_CONFIG_SYNCPROV: "binddn="cn=admin,cn=config" bindmethod=simple credentials=$$LDAP_CONFIG_PASSWORD searchbase="cn=config" type=refreshAndPersist retry="60 +" timeout=1 starttls=critical"
+#
+#      #LDAP_REPLICATION_DB_SYNCPROV: "binddn="cn=admin,$$LDAP_BASE_DN" bindmethod=simple credentials=$$LDAP_ADMIN_PASSWORD searchbase="$$LDAP_BASE_DN" type=refreshAndPersist interval=00:00:00:10 retry="60 +" timeout=1 starttls=critical"
+#
+#      #LDAP_REPLICATION_HOSTS: "#PYTHON2BASH:['ldap://ldap.example.org','ldap://ldap2.example.org']"
+#
+#      KEEP_EXISTING_CONFIG: "false"
+#
+#      LDAP_REMOVE_CONFIG_AFTER_SETUP: "true"
+#
+#      LDAP_SSL_HELPER_PREFIX: "ldap"
+#
+#    tty: true
+#
+#    stdin_open: true
+#
+#    volumes:
+#
+#      - /srv/docker/ldap/ldap:/var/lib/ldap
+#
+#      - /srv/docker/ldap/slap.d:/etc/ldap/slapd.d
+#
+#      - /srv/docker/ldap/certs:/container/service/slapd/assets/certs/
+#
+#    ports:
+#
+#      - "389:389"
+#
+#      - "636:636"
+#
+#    # For replication to work correctly, domainname and hostname must be
+#
+#    # set correctly so that "hostname"."domainname" equates to the
+#
+#    # fully-qualified domain name for the host.
+#
+#    domainname: "example.org"
+#
+#    hostname: "ldap-server"
+#
+#  phpldapadmin:
+#
+#    image: osixia/phpldapadmin:latest
+#
+#    container_name: phpldapadmin
+#
+#    restart: always
+#
+#    environment:
+#
+#      PHPLDAPADMIN_LDAP_HOSTS: "openldap"
+#
+#      PHPLDAPADMIN_HTTPS: "false"
+#
+#    ports:
+#
+#      - "8880:80"
+#
+#    depends_on:
+#
+#      - openldap
+#
+#  svn:
+#
+#    build: ./svn8
+#
+#    container_name: svn-server
+#
+#    restart: always
+#
+#    #ports:
+#
+#    #    - "80:80"
+#
+#    #    - "3690:3690"
+#
+#    #environment:
+#
+#    #    - SVN_REPONAME=test_repo
+#
+#    volumes:
+#
+#        - /srv/docker/svn:/svn
+#
+#        - /srv/docker/apache2/config:/config/apache
--- a/redmine/Dockerfile
+++ b/redmine/Dockerfile
@ -1,2 +1,3 @@
 FROM redmine
-COPY ./redmine_ldap_passwd /usr/share/redmine/plugins/
+ENV REDMINE_DB_PASSWORD=${MYSQL_ROOT_PASSWORD}
+COPY ./redmine_ldap_passwd/. /usr/share/redmine/plugins/
--- a/redmine/Dockerfile~
+++ b/redmine/Dockerfile~
@ -0,0 +1,3 @@
+FROM redmine
+ENV REDMINE_DB_PASSWORD=${MYSQL_ROOT_PASSWORD}
+COPY ./redmine_ldap_passwd/. /usr/share/redmine/plugins/