Update

 - fix restart
 - fix DBD:mysql installation
 - fix volume mount
 - fix timezone

Author: hrchu

Dockerfile

@@ -5,7 +5,7 @@ RUN bash -c "debconf-set-selections <<< 'mysql-server mysql-server/root_password
 RUN bash -c "debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password super'"
 
 RUN apt update 
-RUN apt-get install -y --no-install-recommends cpanminus build-essential supervisor libdbd-mysql-perl sysstat mysql-server libmysqlclient-dev libperl-dev sudo \
+RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y build-essential cpanminus mysql-server libmysqlclient-dev libdbd-mysql-perl libperl-dev sysstat netcat sudo tzdata \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
@@ -16,7 +16,6 @@ RUN cpanm /root/IO-AIO-4.72.tgz
 RUN cpanm BRADFITZ/Sys-Syscall-0.23.tar.gz
 
 RUN cpanm install --force MogileFS::Server \
-  && cpanm install DBD::mysql \
   && cpanm install MogileFS::Utils \
   && cpanm install MogileFS::Network
 
@@ -27,27 +26,15 @@ RUN mkdir -p /etc/mysql/conf.d \
     echo 'datadir = /var/lib/mysql'; \
     echo '!includedir /etc/mysql/conf.d/'; \
   } > /etc/mysql/my.cnf
-
-# Use touch here to workaround https://github.com/docker/for-linux/issues/72#issuecomment-319904698
-RUN mkdir /var/run/mysqld \
-  && chown mysql:mysql /var/run/mysqld \ 
-  && find /var/lib/mysql -type f -exec touch {} \; && mysqld & \
-  timeout 60 bash -c "until mysql -h127.0.0.1 -uroot -psuper -e 'select null limit 1'; do sleep 1; done" \
-  && mysql -uroot -psuper -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'super';" \
-  && mogdbsetup --type=MySQL --yes --dbrootuser=root --dbrootpass=super --dbname=mogilefs --dbuser=mogile --dbpassword=mogilepw
-
-RUN  mkdir -p /etc/mogilefs \
-  && mkdir -p /var/mogdata/dev1 \
-  && mkdir -p /var/mogdata/dev2
+RUN rm -rf /var/lib/mysql/*
 
 COPY mogilefsd.conf /etc/mogilefs/mogilefsd.conf
 COPY mogstored.conf /etc/mogilefs/mogstored.conf
 COPY mogilefs.conf /root/.mogilefs.conf
 COPY run.sh /run.sh
 
-RUN adduser mogile --system --disabled-password \
-  && chown mogile -R /var/mogdata
+RUN adduser mogile --system --disabled-password 
 
-EXPOSE 7001 7500
+EXPOSE 7001 7500 7501
 
 ENTRYPOINT ["/run.sh"]

README.md

@@ -58,10 +58,6 @@ Checking devices...
              total:   956.450    120.078    836.372  12.55%
 ```
 
-# Known issues
-
-* The container will fail to start with `docker restart`. Use `docker stop && docker start [container name]` instead. 
-
 # Contributing
 All contributions are welcome. Nothing else special.
 

run.sh

@@ -1,6 +1,26 @@
 #!/bin/bash
 set -x
 
+MYSQL_FILE_COUNT=$(ls /var/lib/mysql|wc -l)
+if [ $MYSQL_FILE_COUNT != 0 ]; then
+  mkdir -p /var/run/mysqld 
+  chown mysql:mysql /var/run/mysqld  
+  rm /var/run/mysqld/*
+  find /var/lib/mysql -type f -exec touch {} \;
+  mysqld &
+  sleep 3; timeout 60 bash -c "until mysql -uroot -psuper -e 'select null limit 1'; do sleep 1; done" 
+
+  set -m
+  sudo -u mogile mogstored -c /etc/mogilefs/mogstored.conf &
+  sudo -u mogile mogilefsd -c /etc/mogilefs/mogilefsd.conf &
+  sleep 5
+
+  mogadm check
+  fg
+fi
+
+#############
+
 if [ "`echo ${NODE_HOST}`" == "" ]
 then
   NODE_HOST="127.0.0.1"
@@ -12,10 +32,20 @@ then
   NODE_PORT="7500"
 fi
 
-find /var/lib/mysql -type f -exec touch {} \; && mysqld &
-timeout 60 bash -c "until mysql -h127.0.0.1 -uroot -psuper -e 'select null limit 1'; do sleep 1; done" 
+mkdir -p /var/run/mysqld 
+chown mysql:mysql /var/run/mysqld  
+
+# Use touch here to workaround https://github.com/docker/for-linux/issues/72#issuecomment-319904698
+find /var/lib/mysql -type f -exec touch {} \;
+mysqld --initialize-insecure
+mysqld &
 
-sudo -u mogile mogilefsd --daemon -c /etc/mogilefs/mogilefsd.conf
+timeout 60 bash -c "until mysql -uroot -e 'select null limit 1'; do sleep 1; done" 
+mysql -uroot -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'super';" 
+
+mogdbsetup --type=MySQL --yes --dbrootuser=root --dbrootpass=super --dbname=mogilefs --dbuser=mogile --dbpassword=mogilepw
+
+sudo -u mogile mogilefsd -c /etc/mogilefs/mogilefsd.conf &
 sleep 5
 
 mogadm --trackers=127.0.0.1:7001 host add mogilestorage --ip=${NODE_HOST} --port=${NODE_PORT} --status=alive
@@ -42,11 +72,15 @@ fi
 mogadm domain list
 mogadm class list
 
+
+mkdir -p /etc/mogilefs \
+  && mkdir -p /var/mogdata/dev1 \
+  && mkdir -p /var/mogdata/dev2
+chown mogile -R /var/mogdata
+
+set -m
 sudo -u mogile mogstored -c /etc/mogilefs/mogstored.conf &
 sleep 5
 
 mogadm check
-pkill mogilefsd
-
-sudo -u mogile mogilefsd -c /etc/mogilefs/mogilefsd.conf 
-
+fg