Browse Source

I need an explanation for why this is required (#3331)

Mike Smith 7 years ago
parent
commit
50cb0632e8

+ 4 - 2
toolset/setup/linux/docker/databases/mysql/mysql.dockerfile

@@ -33,8 +33,10 @@ RUN cp -R -p /var/log/mysql /ssd/log
 # do not see running processes from prior RUN calls; therefor, each command here
 # that relies on the mysql server running will explicitly start the server and
 # perform the work required.
-RUN service mysql start && \
+RUN chown -R mysql:mysql /var/lib/mysql /var/log/mysql /var/run/mysqld /ssd && \
+    service mysql start & \
+    until mysql -uroot -psecret -e "exit"; do sleep 1; done && \
     mysqladmin -uroot -psecret flush-hosts && \
     mysql -uroot -psecret < create.sql
 
-CMD ["mysqld"]
+CMD chown -R mysql:mysql /var/lib/mysql /var/log/mysql /var/run/mysqld /ssd && mysqld

+ 5 - 5
toolset/setup/linux/docker/databases/mysql/mysql.list

@@ -1,7 +1,7 @@
 # You may comment out entries below, but any other modifications may be lost.
 # Use command 'dpkg-reconfigure mysql-apt-config' as root for modifications.
-deb http://repo.mysql.com/apt/ubuntu/ trusty mysql-apt-config
-deb http://repo.mysql.com/apt/ubuntu/ trusty mysql-5.7
-deb http://repo.mysql.com/apt/ubuntu/ trusty mysql-tools
-#deb http://repo.mysql.com/apt/ubuntu/ trusty mysql-tools-preview
-deb-src http://repo.mysql.com/apt/ubuntu/ trusty mysql-5.7
+deb http://repo.mysql.com/apt/ubuntu/ xenial mysql-apt-config
+deb http://repo.mysql.com/apt/ubuntu/ xenial mysql-5.7
+deb http://repo.mysql.com/apt/ubuntu/ xenial mysql-tools
+#deb http://repo.mysql.com/apt/ubuntu/ xenial mysql-tools-preview
+deb-src http://repo.mysql.com/apt/ubuntu/ xenial mysql-5.7