temporarily reverted to a version of mysql 5.5

This commit is contained in:
Alexey Bannov 2017-06-19 05:06:34 -04:00
parent 042e65d486
commit 4bad4c6c21
2 changed files with 8 additions and 9 deletions

View File

@ -25,7 +25,7 @@ RUN echo "${SOURCE_REPO_URL}" >> /etc/apt/sources.list && \
wget https://www.openssl.org/source/openssl-1.1.0f.tar.gz && \
tar xzvf openssl-1.1.0f.tar.gz && \
cd openssl-1.1.0f && \
./config -Wl,--enable-new-dtags,-rpath,'$(LIBRPATH)' && \
./config && \
make && \
sudo make install && \
cd .. && \
@ -37,9 +37,6 @@ RUN echo "${SOURCE_REPO_URL}" >> /etc/apt/sources.list && \
add-apt-repository -y ppa:builds/sphinxsearch-rel22 && \
add-apt-repository -y ppa:certbot/certbot && \
echo "Start=No" >> /etc/init.d/sphinxsearch && \
wget http://dev.mysql.com/get/mysql-apt-config_0.8.6-1_all.deb && \
echo "mysql-apt-config mysql-apt-config/select-server select mysql-5.7" | sudo debconf-set-selections && \
dpkg -i mysql-apt-config_0.8.6-1_all.deb && \
apt-get -y update && \
apt-get install --force-yes -yq mysql-server mono-complete ca-certificates-mono && \
echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
@ -58,6 +55,4 @@ VOLUME ["/var/lib/mysql"]
EXPOSE 80 443 5222 3306 9865 9888 9866 9871 9882 5280
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
CMD ["/app/onlyoffice/run-community-server.sh"];

View File

@ -296,8 +296,8 @@ if [ "${MYSQL_SERVER_EXTERNAL}" == "false" ]; then
if [ ! -f /var/lib/mysql/ibdata1 ]; then
# cp /etc/mysql/my.cnf /usr/share/mysql/my-default.cnf
mysqld --initialize-insecure --user=mysql || true
mysql_install_db || true
# mysqld --initialize-insecure --user=mysql || true
fi
if [ ${LOG_DEBUG} ]; then
@ -338,7 +338,11 @@ EOF
fi
fi
mysql_scalar_exec "GRANT ALL PRIVILEGES ON *.* TO 'debian-sys-maint'@'localhost'" "opt_ignore_db_name";
DEBIAN_SYS_MAINT_PASS=$(grep "password" /etc/mysql/debian.cnf | head -1 | sed 's/password\s*=\s*//' | tr -d '[[:space:]]');
mysql_scalar_exec "GRANT ALL PRIVILEGES ON *.* TO 'debian-sys-maint'@'localhost' IDENTIFIED BY '${DEBIAN_SYS_MAINT_PASS}'"
#mysql_scalar_exec "GRANT ALL PRIVILEGES ON *.* TO 'debian-sys-maint'@'localhost'" "opt_ignore_db_name";
else
service mysql stop