Compare commits

..

No commits in common. '6bb71e30500c0ea7e9a7ae96d221b10b0bff0fbb' and 'defeff68a4f38219221cf789df2c1e5431df263c' have entirely different histories.

  1. 29
      docker-compose.yml
  2. 28
      docker-compose.yml~
  3. 4
      redmine/Dockerfile
  4. 4
      redmine/Dockerfile~
  5. 0
      redmine/redmine_ldap_passwd-master/README.md
  6. 0
      redmine/redmine_ldap_passwd-master/app/models/auth_source_ldap_passwd.rb
  7. 0
      redmine/redmine_ldap_passwd-master/config/locales/en.yml
  8. 0
      redmine/redmine_ldap_passwd-master/init.rb
  9. 0
      redmine/redmine_ldap_passwd-master/lib/redmine_ldap_passwd_account_controller_patch.rb
  10. 0
      redmine/redmine_ldap_passwd-master/lib/redmine_ldap_passwd_auth_sources_helper_patch.rb
  11. 0
      redmine/redmine_ldap_passwd-master/lib/redmine_ldap_passwd_my_controller_patch.rb

@ -10,14 +10,12 @@ services:
environment:
REDMINE_DB_MYSQL: db
REDMINE_SECRET_KEY_BASE: supersecretkey
REDMINE_PLUGINS_MIGRATE: "true"
REDMINE_PLUGINS_MIGRATE: true
env_file:
- db.env
volumes:
- redmine-files:/usr/src/redmine/files
- redmine-logs:/var/log/redmine
depends_on:
- db
- /srv/docker/redmine/redmine_mysql:/usr/src/redmine/files
- /srv/docker/redmine/redmine-logs:/var/log/redmine
db:
image: mysql:5.7
@ -26,26 +24,9 @@ services:
environment:
MYSQL_DATABASE: redmine
env_file:
- db.env
- db.env
volumes:
- db:/var/lib/mysql
volumes:
db:
driver_opts:
type: none
device: /tmp/docker/redmine-db
o: bind
redmine-files:
driver_opts:
type: none
device: /tmp/docker/redmine-files
o: bind
redmine-logs:
driver_opts:
type: none
device: /tmp/docker/redmine-logs
o: bind
- /srv/docker/redmine/mysql:/var/lib/mysql
# openldap:
#

@ -14,10 +14,9 @@ services:
env_file:
- db.env
volumes:
- redmine-files:/usr/src/redmine/files
- redmine-logs:/var/log/redmine
depends_on:
- db
- /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
@ -26,26 +25,9 @@ services:
environment:
MYSQL_DATABASE: redmine
env_file:
- db.env
- db.env
volumes:
- db:/var/lib/mysql
volumes:
db:
driver_opts:
type: none
device: /tmp/docker/redmine-db
o: bind
redmine-files:
driver_opts:
type: none
device: /tmp/docker/redmine-files
o: bind
redmine-logs:
driver_opts:
type: none
device: /tmp/docker/redmine-logs
o: bind
- /srv/docker/redmine/mysql:/var/lib/mysql
# openldap:
#

@ -1,3 +1,3 @@
FROM redmine:latest
FROM redmine
ENV REDMINE_DB_PASSWORD=${MYSQL_ROOT_PASSWORD}
ADD ./redmine_ldap_passwd/ /usr/share/redmine/plugins/
COPY ./redmine_ldap_passwd/. /usr/share/redmine/plugins/

@ -1,3 +1,3 @@
FROM redmine:latest
FROM redmine
ENV REDMINE_DB_PASSWORD=${MYSQL_ROOT_PASSWORD}
COPY redmine_ldap_passwd /usr/share/redmine/plugins/
COPY ./redmine_ldap_passwd/. /usr/share/redmine/plugins/

Loading…
Cancel
Save