fixbugs

baseimg/tools/dbv2/Dockerfile

@@ -15,19 +15,6 @@ ENV MY_GROUP="mysql"
 ENV MY_UID="48"
 ENV MY_GID="48"
 
-# Files
-ENV MYSQL_BASE_INCL="/etc/my.cnf.d"
-ENV MYSQL_CUST_INCL1="/etc/mysql/conf.d"
-ENV MYSQL_CUST_INCL2="/etc/mysql/docker-default.d"
-ENV MYSQL_DEF_DAT="/var/lib/mysql"
-ENV MYSQL_DEF_LOG="/var/log/mysql"
-ENV MYSQL_DEF_PID="/var/run/mysqld"
-ENV MYSQL_DEF_SCK="/var/sock/mysqld"
-
-ENV MYSQL_LOG_SLOW="${MYSQL_DEF_LOG}/slow.log"
-ENV MYSQL_LOG_ERROR="${MYSQL_DEF_LOG}/error.log"
-ENV MYSQL_LOG_QUERY="${MYSQL_DEF_LOG}/query.log"
-
 ###
 ### Install
 ###
@@ -53,6 +40,18 @@ RUN \
 	yum -y install hostname && \
 	yum clean all
 
+# Files
+ENV MYSQL_BASE_INCL="/etc/my.cnf.d"
+ENV MYSQL_CUST_INCL1="/etc/mysql/conf.d"
+ENV MYSQL_CUST_INCL2="/etc/mysql/docker-default.d"
+ENV MYSQL_DEF_DAT="/var/lib/mysql"
+ENV MYSQL_DEF_LOG="/var/log/mysql"
+ENV MYSQL_DEF_PID="/var/run/mysqld"
+ENV MYSQL_DEF_SCK="/var/sock/mysqld"
+
+ENV MYSQL_LOG_SLOW="${MYSQL_DEF_LOG}/slow.log"
+ENV MYSQL_LOG_ERROR="${MYSQL_DEF_LOG}/error.log"
+ENV MYSQL_LOG_QUERY="${MYSQL_DEF_LOG}/query.log"
 
 ##
 ## Configure
@@ -90,30 +89,6 @@ RUN \
 	chmod 0775 ${MYSQL_DEF_PID} && \
 	chmod 0775 ${MYSQL_DEF_LOG}
 
-RUN \
-	echo "[client]"                                         > /etc/my.cnf && \
-	echo "socket = ${MYSQL_DEF_SCK}/mysqld.sock"           >> /etc/my.cnf && \
-	\
-	echo "[mysql]"                                         >> /etc/my.cnf && \
-	echo "socket = ${MYSQL_DEF_SCK}/mysqld.sock"           >> /etc/my.cnf && \
-	\
-	echo "[mysqld]"                                        >> /etc/my.cnf && \
-	echo "skip-host-cache"                                 >> /etc/my.cnf && \
-	echo "skip-name-resolve"                               >> /etc/my.cnf && \
-	echo "datadir = ${MYSQL_DEF_DAT}"                      >> /etc/my.cnf && \
-	echo "user = ${MY_USER}"                               >> /etc/my.cnf && \
-	echo "port = 3306"                                     >> /etc/my.cnf && \
-	echo "bind-address = 0.0.0.0"                          >> /etc/my.cnf && \
-	echo "socket = ${MYSQL_DEF_SCK}/mysqld.sock"           >> /etc/my.cnf && \
-	echo "pid-file = ${MYSQL_DEF_PID}/mysqld.pid"          >> /etc/my.cnf && \
-	echo "general_log_file = ${MYSQL_LOG_QUERY}"           >> /etc/my.cnf && \
-	echo "slow_query_log_file = ${MYSQL_LOG_SLOW}"         >> /etc/my.cnf && \
-	echo "log-error = ${MYSQL_LOG_ERROR}"                  >> /etc/my.cnf && \
-	echo "log-bin=/var/lib/mysql/mysql-bin"                >> /etc/my.cnf && \
-	echo "!includedir ${MYSQL_BASE_INCL}/"                 >> /etc/my.cnf && \
-	echo "!includedir ${MYSQL_CUST_INCL1}/"                >> /etc/my.cnf && \
-	echo "!includedir ${MYSQL_CUST_INCL2}/"                >> /etc/my.cnf
-
 
 ##
 ## Bootstrap Scipts