36a1489 Merge branch 'f27' into f28

Merged and Committed by hhorak 6 years ago
50 files changed. 2086 lines added. 600 lines removed.
Dockerfile
file modified
+31 -18
Dockerfile.fedora
file added
+1
cccp.yml
file added
+1
content_sets.yml
file added
+10
help.md
file added
+1
root-common/etc/my.cnfroot/etc/my.cnf
file renamed
+0 -0
root-common/usr/bin/cgroup-limitsroot/usr/bin/cgroup-limits
file renamed
+0 -0
root-common/usr/bin/container-entrypointroot/usr/bin/container-entrypoint
file renamed
+0 -0
root-common/usr/bin/mysqld-master
file added
+1
root-common/usr/bin/mysqld-slave
file added
+1
root-common/usr/bin/run-mysqldroot/usr/bin/run-mysqld
file renamed
+7 -14
root-common/usr/bin/run-mysqld-masterroot/usr/bin/run-mysqld-master
file renamed
+8 -12
root-common/usr/bin/run-mysqld-slaveroot/usr/bin/run-mysqld-slave
file renamed
+8 -10
root-common/usr/bin/usage
file added
+4
root-common/usr/libexec/container-setuproot/usr/libexec/container-setup
file renamed
+2 -1
root-common/usr/libexec/fix-permissions
file added
+6
root-common/usr/share/container-scripts/mysql/cnf/40-paas.cnfroot/usr/share/container-scripts/mysql/my-paas.cnf.template
file renamed
+4 -0
root-common/usr/share/container-scripts/mysql/cnf/50-my-tuning.cnfroot/usr/share/container-scripts/mysql/my-tuning.cnf.template
file renamed
+0 -1
root-common/usr/share/container-scripts/mysql/common.shroot/usr/share/container-scripts/mysql/common.sh
file renamed
+90 -29
root-common/usr/share/container-scripts/mysql/helpers.shroot/usr/share/container-scripts/mysql/helpers.sh
file renamed
+0 -0
root-common/usr/share/container-scripts/mysql/init/50-passwd-change.shroot/usr/share/container-scripts/mysql/passwd-change.sh
file renamed
+43 -17
root-common/usr/share/container-scripts/mysql/post-init.shroot/usr/share/container-scripts/mysql/post-init.sh
file renamed
+0 -0
root-common/usr/share/container-scripts/mysql/pre-init/20-validate-variables.shroot/usr/share/container-scripts/mysql/validate-variables.sh
file renamed
+6 -2
root-common/usr/share/container-scripts/mysql/pre-init/25-validate-replication-variables.shroot/usr/share/container-scripts/mysql/validate-replication-variables.sh
file renamed
+4 -1
root-common/usr/share/container-scripts/mysql/pre-init/30-base-config.sh
file added
+3
root-common/usr/share/container-scripts/mysql/pre-init/60-replication-config.sh
file added
+17
root-common/usr/share/container-scripts/mysql/pre-init/70-s2i-config.sh
file added
+6
root-common/usr/share/container-scripts/mysql/pre-init/my-base.cnf.templateroot/usr/share/container-scripts/mysql/my-base.cnf.template
file renamed
+0 -0
root-common/usr/share/container-scripts/mysql/pre-init/my-master.cnf.templateroot/usr/share/container-scripts/mysql/my-master.cnf.template
file renamed
+0 -0
root-common/usr/share/container-scripts/mysql/pre-init/my-repl-gtid.cnf.templateroot/usr/share/container-scripts/mysql/my-repl-gtid.cnf.template
file renamed
+0 -0
root-common/usr/share/container-scripts/mysql/pre-init/my-slave.cnf.templateroot/usr/share/container-scripts/mysql/my-slave.cnf.template
file renamed
+0 -0
root-common/usr/share/container-scripts/mysql/scl_enableroot/usr/share/container-scripts/mysql/scl_enable
file renamed
+0 -0
root/help.1
file removed
-332
root/usr/bin/mysqld-master
file removed
-1
root/usr/bin/mysqld-slave
file removed
-1
root/usr/share/container-scripts/mysql/README.md
file modified
+206 -55
s2i-common/bin/assemble
file added
+13
s2i-common/bin/run
file added
+1
s2i-common/bin/usage
file added
+8
sources
file removed
-0
test/mariadb-ephemeral-template.json
file added
+254
test/run
file modified
+171 -106
test/run-openshift
file added
+122
test/test-app/mysql-cfg/myconfig.cnf
file added
+3
test/test-app/mysql-data/init.sql
file added
+4
test/test-app/mysql-init/80-add-arbitrary-users.sh
file added
+17
test/test-app/mysql-init/90-init-db.sh
file added
+12
test/test-app/mysql-pre-init/80-check-arbitrary-users.sh
file added
+10
test/test-lib-openshift.sh
file added
+609
test/test-lib.sh
file added
+402
    Merge branch 'f27' into f28
    
        
file modified
+31 -18
file added
+1
file added
+1
file added
+10
file added
+1
root-common/etc/my.cnf root/etc/my.cnf
file renamed
file was renamed with no change to the file
root-common/usr/bin/cgroup-limits root/usr/bin/cgroup-limits
file renamed
file was renamed with no change to the file
root-common/usr/bin/container-entrypoint root/usr/bin/container-entrypoint
file renamed
file was renamed with no change to the file
root-common/usr/bin/run-mysqld root/usr/bin/run-mysqld
file renamed
+7 -14
root-common/usr/bin/run-mysqld-master root/usr/bin/run-mysqld-master
file renamed
+8 -12
root-common/usr/bin/run-mysqld-slave root/usr/bin/run-mysqld-slave
file renamed
+8 -10
root-common/usr/libexec/container-setup root/usr/libexec/container-setup
file renamed
+2 -1
root-common/usr/share/container-scripts/mysql/cnf/40-paas.cnf root/usr/share/container-scripts/mysql/my-paas.cnf.template
file renamed
root-common/usr/share/container-scripts/mysql/cnf/50-my-tuning.cnf root/usr/share/container-scripts/mysql/my-tuning.cnf.template
file renamed
root-common/usr/share/container-scripts/mysql/common.sh root/usr/share/container-scripts/mysql/common.sh
file renamed
+90 -29
root-common/usr/share/container-scripts/mysql/helpers.sh root/usr/share/container-scripts/mysql/helpers.sh
file renamed
file was renamed with no change to the file
root-common/usr/share/container-scripts/mysql/init/50-passwd-change.sh root/usr/share/container-scripts/mysql/passwd-change.sh
file renamed
+43 -17
root-common/usr/share/container-scripts/mysql/post-init.sh root/usr/share/container-scripts/mysql/post-init.sh
file renamed
file was renamed with no change to the file
root-common/usr/share/container-scripts/mysql/pre-init/20-validate-variables.sh root/usr/share/container-scripts/mysql/validate-variables.sh
file renamed
+6 -2
root-common/usr/share/container-scripts/mysql/pre-init/25-validate-replication-variables.sh root/usr/share/container-scripts/mysql/validate-replication-variables.sh
file renamed
+4 -1
root-common/usr/share/container-scripts/mysql/pre-init/my-base.cnf.template root/usr/share/container-scripts/mysql/my-base.cnf.template
file renamed
file was renamed with no change to the file
root-common/usr/share/container-scripts/mysql/pre-init/my-master.cnf.template root/usr/share/container-scripts/mysql/my-master.cnf.template
file renamed
file was renamed with no change to the file
root-common/usr/share/container-scripts/mysql/pre-init/my-repl-gtid.cnf.template root/usr/share/container-scripts/mysql/my-repl-gtid.cnf.template
file renamed
file was renamed with no change to the file
root-common/usr/share/container-scripts/mysql/pre-init/my-slave.cnf.template root/usr/share/container-scripts/mysql/my-slave.cnf.template
file renamed
file was renamed with no change to the file
root-common/usr/share/container-scripts/mysql/scl_enable root/usr/share/container-scripts/mysql/scl_enable
file renamed
file was renamed with no change to the file
file removed
-332
file added
+1
file removed
-0
file modified
+171 -106
file added
+122
file added
+402