Merge pull request #10 from mederly/mariadb10

Add yet more diagnostics...
docker · Oct 13, 2018 · 5f35041 · 5f35041
2 parents 9efd4c3 + d326dd9
commit 5f35041
Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -53,6 +53,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"

diff --git a/container_files/bin/start.sh b/container_files/bin/start.sh
@@ -18,6 +18,9 @@ if [ -e "/tmp/firsttimerunning" ]; then
     echo "Setting DataDir: $MYSQL_DATADIR" >> $log
     sed -e "s=\${MYSQL_DATADIR}=$MYSQL_DATADIR=" < /etc/my.cnf > /etc/my.cnf
 
+    echo "/etc/my.cnf is:"
+    cat /etc/my.cnf
+
     if [[ $CREATE_NEW_DATABASE == 1 || ($CREATE_NEW_DATABASE == if_needed && ( ! -d $MYSQL_DATADIR || -z $(ls -A $MYSQL_DATADIR) ) ) ]]; then
 
         echo "Installing MariaDB" >> $log