Dockerfile

@@ -1,10 +1,10 @@
-FROM tier/centos7base
+FROM centos:centos7
 
 # Define args and set a default value
 ARG registry=docker.io
 ARG maintainer=tier
 ARG imagename=mariadb
-ARG version=5.5
+ARG version=10.2
 
 MAINTAINER $maintainer
 LABEL Vendor="Internet2"
@@ -15,15 +15,20 @@ LABEL Version=$version
 
 LABEL Build docker build --rm --tag $registry/$maintainer/$imagename .
 
+#copy MariaDB yum repo file
+COPY ./conf/mariadb.repo /etc/yum.repos.d/
+
 # Install base deps
-RUN yum -y install --setopt=tsflags=nodocs mariadb-server bind-utils pwgen psmisc hostname vim
+RUN yum -y install --setopt=tsflags=nodocs MariaDB-server bind-utils net-tools pwgen psmisc hostname vim
+
+RUN yum -y update
 
 # Add starters and installers
 ADD ./container_files /opt
 RUN rm -rf /etc/my.cnf
 COPY ./conf/my.cnf /etc
 # Add Volumes and Set permissions
-RUN mkdir /opt/shared && chmod 777 /opt/shared && chmod 777 /opt/bin/*.sh
+RUN mkdir /opt/shared && chmod 777 /opt/shared && mkdir /var/log/mariadb && mkdir /var/run/mariadb && chmod 777 /opt/bin/*.sh && touch /tmp/firsttimerunning
 
 # Place VOLUME statement below all changes to /var/lib/mysql
 VOLUME /var/lib/mysql

Jenkinsfile

@@ -10,9 +10,11 @@ node('docker') {
     dir('tmp'){
       git([ url: "https://github.internet2.edu/docker/util.git",
           credentialsId: "jenkins-github-access-token" ])
+      sh 'rm -rf ../bin/*'
       sh 'mv ./bin/* ../bin/.'
     }
-
+    sh 'rm -rf tmp'
+
   stage 'Setting build context'
 
     def maintainer = maintainer()
@@ -53,6 +55,7 @@ node('docker') {
     try{
       sh 'bin/test.sh &> debug'
     } catch(error) {
+      sh "docker logs $imagename &>> debug"
       def error_details = readFile('./debug');
       def message = "BUILD ERROR: There was a problem building ${imagename}:${tag}. \n\n ${error_details}"
       sh "rm -f ./debug"
@@ -100,4 +103,4 @@ def handleError(String message){
   slackSend color: 'danger', message: "${message}"
   //step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'chris.bynum@levvel.io', sendToIndividuals: true])
   sh 'exit 1'
-}
+}

conf/mariadb.repo

@@ -0,0 +1,6 @@
+[mariadb]
+name = MariaDB
+baseurl = http://yum.mariadb.org/10.2/centos7-amd64
+gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
+gpgcheck=1
+

conf/my.cnf

@@ -11,7 +11,7 @@
 # this is only for the mysqld standalone daemon
 [mysqld]
 skip-character-set-client-handshake
-datadir=/var/lib/mysqlmounted
+datadir=${MYSQL_DATADIR}
 socket=/var/lib/mysql/mysql.sock
 character-set-server=utf8
 #default-character-set=utf8

container_files/bin/fix-all-permissions.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "Fixing Permissions"
+chown -R mysql:mysql $MYSQL_DATADIR
+/opt/bin/fix-permissions.sh $MYSQL_DATADIR
+/opt/bin/fix-permissions.sh /var/log/mariadb/
+/opt/bin/fix-permissions.sh /var/run/
+echo "Done Fixing Permissions"

container_files/bin/fix-permissions.sh

@@ -2,15 +2,6 @@
 
 log="/tmp/permissions.log"
 
-echo "Starting Container: " > $log
-date >> $log
-echo "" >> $log
-
-# Taken from https://raw.githubusercontent.com/openshift/sti-base/master/bin/fix-permissions
-# Fix permissions on the given directory to allow group read/write of 
-# regular files and execute of directories.
-chgrp -R 0 $1 >> $log
-chmod -R g+rw $1 >> $log
-find $1 -type d -exec chmod g+x {} + >> $log
-
+chmod -R 777 $1
+find $1 -type d -exec chmod 777 {} + >> $log
 exit 0

container_files/bin/start.sh

@@ -16,8 +16,11 @@ if [ -e "/tmp/firsttimerunning" ]; then
     fi
 
     echo "Setting DataDir: $MYSQL_DATADIR" >> $log
-
-    if [ "$CREATE_NEW_DATABASE" == "1" ]; then
+    sed -e "s=\${MYSQL_DATADIR}=$MYSQL_DATADIR=" < /etc/my.cnf > /etc/my.cnf.new
+    rm /etc/my.cnf >> $log
+    mv /etc/my.cnf.new /etc/my.cnf >> $log
+
+    if [[ $CREATE_NEW_DATABASE == 1 || ($CREATE_NEW_DATABASE == if_needed && ( ! -d $MYSQL_DATADIR || -z $(ls -A $MYSQL_DATADIR) ) ) ]]; then
 
         echo "Installing MariaDB" >> $log
 
@@ -26,15 +29,15 @@ if [ -e "/tmp/firsttimerunning" ]; then
             echo >&2 '  Did you forget to add -e MYSQL_ROOT_PASSWORD=... ?' >> $log
             exit 1
         fi
-        
+
         echo 'Running mysql_install_db ...' >> $log
         mysql_install_db --defaults-file=/etc/my.cnf --datadir="$MYSQL_DATADIR" >> $log
         echo 'Finished mysql_install_db' >> $log
-        
+
         # These statements _must_ be on individual lines, and _must_ end with
         # semicolons (no line breaks or comments are permitted).
         # TODO proper SQL escaping on ALL the things D:
-        
+
         tempSqlFile='/tmp/mysql-first-time.sql'
         echo "DELETE FROM mysql.user ;" > $tempSqlFile
         echo "CREATE USER 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ;" >> $tempSqlFile
@@ -43,7 +46,6 @@ if [ -e "/tmp/firsttimerunning" ]; then
         echo "GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION;" >> $tempSqlFile
         echo "DROP DATABASE IF EXISTS test ;" >> $tempSqlFile
 
-
         if [ "$MYSQL_DATABASE" != "" ]; then
             echo "flush privileges;" >> "$tempSqlFile"
             echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` ;" >> "$tempSqlFile"
@@ -54,23 +56,23 @@ if [ -e "/tmp/firsttimerunning" ]; then
             echo "GRANT ALL ON $MYSQL_DATABASE.* TO '$MYSQL_USER'@'$MYSQL_DATABASE.%_i2network' IDENTIFIED BY '$MYSQL_PASSWORD' ;" >> "$tempSqlFile"
             echo "GRANT ALL ON $MYSQL_DATABASE.* TO '$MYSQL_USER'@'$MYSQL_DATABASE.%_i2network' IDENTIFIED BY '$MYSQL_PASSWORD' ;" >> "$tempSqlFile"
         fi
-    
+
         echo 'FLUSH PRIVILEGES ;' >> "$tempSqlFile"
         # [jvf] mysqld_safe unknown option '--character-set-server=utf8' [FIXME]
         #echo "character-set-server = utf8" >> /etc/my.cnf
         #echo "collation-server = utf8_unicode_ci" >> /etc/my.cnf
         #echo "" >> /etc/my.cnf
-
-        echo "Fixing Permissions" >> $log
-        chown -R mysql:mysql $MYSQL_DATADIR
-        /opt/bin/fix-permissions.sh $MYSQL_DATADIR >> $log
-        /opt/bin/fix-permissions.sh /var/log/mariadb/ >> $log
-        /opt/bin/fix-permissions.sh /var/run/ >> $log
-        echo "Done Fixing Permissions" >> $log
+
+        if [ -e "$AFTER_FIRST_TIME_SQL" ]; then
+            cat $AFTER_FIRST_TIME_SQL >> $tempSqlFile
+        fi
+
+        /opt/bin/fix-all-permissions.sh >> $log
         rm -f /tmp/firsttimerunning
         /usr/bin/mysqld_safe --init-file="$tempSqlFile" --datadir="$MYSQL_DATADIR"
     else
         echo "Not Creating a MariaDB - Using Existing from DataDir: $MYSQL_DATADIR" >> $log
+        /opt/bin/fix-all-permissions.sh >> $log
         rm -f /tmp/firsttimerunning
         /usr/bin/mysqld_safe --datadir="$MYSQL_DATADIR"
     fi

tests/running.bats

@@ -25,9 +25,11 @@ load ../common
 }
 
 @test "UTF8 collations" {
+  docker exec -i $imagename mysql -u root -h 127.0.0.1 --password=123321 -e 'show variables' | grep collation
   docker exec -i $imagename mysql -u root -h 127.0.0.1 --password=123321 -e 'show variables' | grep collation | grep utf8_bin
 }
 
 @test "UTF8 databases" {
+  docker exec -i $imagename mysql -u root -h 127.0.0.1 --password=123321 -e 'show create database registry'
   docker exec -i $imagename mysql -u root -h 127.0.0.1 --password=123321 -e 'show create database registry' | grep "DEFAULT CHARACTER SET utf8 COLLATE utf8_bin"
-}
+}