[kylin] branch kylin-on-parquet-v2 updated: KYLIN-4944 kylin4 Docker image is upgraded from centos6.9 to centos7… (#1635)

[xxyu]

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch kylin-on-parquet-v2
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/kylin-on-parquet-v2 by this 
push:
     new ee1be8c  KYLIN-4944  kylin4 Docker image is upgraded from centos6.9 to 
centos7… (#1635)
ee1be8c is described below

commit ee1be8c5f69ce87804913bdeabba7c1189e6358a
Author: weijian wang <cn709...@gmail.com>
AuthorDate: Tue May 25 10:27:00 2021 +0800

    KYLIN-4944  kylin4 Docker image is upgraded from centos6.9 to centos7… 
(#1635)
    
    * KYLIN-4944  kylin4 Docker image is upgraded from centos6.9 to 
centos7.9.2009
    
    * KYLIN-4944  kylin4 Docker image is upgraded from centos6.9 to 
centos7.9.2009
---
 docker/dockerfile/standalone/Dockerfile_hadoop | 15 +++++++++++----
 docker/dockerfile/standalone/entrypoint.sh     | 13 ++++++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/docker/dockerfile/standalone/Dockerfile_hadoop 
b/docker/dockerfile/standalone/Dockerfile_hadoop
index 8e76855..2e51bf9 100644
--- a/docker/dockerfile/standalone/Dockerfile_hadoop
+++ b/docker/dockerfile/standalone/Dockerfile_hadoop
@@ -16,11 +16,11 @@
 #
 
 # Docker image with Hadoop/Spark/Hive/ZK/Kafka installed
-FROM centos:6.9
+FROM centos:7.9.2009
 
 ENV HIVE_VERSION 1.2.1
-ENV HADOOP_VERSION 2.7.0
-ENV SPARK_VERSION 2.4.6
+ENV HADOOP_VERSION 2.8.5
+ENV SPARK_VERSION 2.4.7
 ENV ZK_VERSION 3.4.6
 ENV KAFKA_VERSION 1.1.1
 
@@ -41,7 +41,14 @@ USER root
 WORKDIR /home/admin
 
 # install tools
-RUN yum -y install lsof.x86_64 wget.x86_64 tar.x86_64 git.x86_64 
mysql-server.x86_64 mysql.x86_64 unzip.x86_64
+RUN yum -y install lsof.x86_64 wget.x86_64 tar.x86_64 git.x86_64 which.x86_64 
net-tools.x86_64  unzip.x86_64
+
+#install mysql
+RUN wget https://dev.mysql.com/get/mysql80-community-release-el7-3.noarch.rpm \
+    && rpm -Uvh mysql80-community-release-el7-3.noarch.rpm \
+    && yum-config-manager --disable mysql80-community \
+    && yum-config-manager --enable mysql57-community \
+    && yum install -y mysql-community-server.x86_64 
mysql-community-client.x86_64
 
 # install mvn
 RUN wget 
https://archive.apache.org/dist/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.tar.gz
 \
diff --git a/docker/dockerfile/standalone/entrypoint.sh 
b/docker/dockerfile/standalone/entrypoint.sh
index 31664f7..c7e642a 100644
--- a/docker/dockerfile/standalone/entrypoint.sh
+++ b/docker/dockerfile/standalone/entrypoint.sh
@@ -20,16 +20,19 @@ echo "127.0.0.1 sandbox sandbox.hortonworks.com" >> 
/etc/hosts
 
 # clean pid files
 rm -f /tmp/*.pid
-
+if [ ! -f "/home/admin/first_run" ]
+then
+    mysqld_pre_systemd
+fi
+mysqld --daemonize --pid-file=/var/run/mysqld/mysqld.pid -u root
 # start mysql
 if [ ! -f "/home/admin/first_run" ]
 then
-    service mysqld start
-    mysqladmin -uroot password 123456
+    mysql_init_password=`cat /var/log/mysqld.log |grep -Po '(?<=A temporary 
password is generated for root@localhost: )\S+'`
+    mysql --connect-expired-password -u root -p$mysql_init_password -e "set 
global validate_password_policy=0;set global validate_password_length=6;alter 
user user() identified by '123456';"
     mysql -uroot -p123456 -e "CREATE DATABASE IF NOT EXISTS kylin4 default 
charset utf8 COLLATE utf8_general_ci;"
-    mysql -uroot -p123456 -e "grant all privileges on root.* to root@'%' 
identified by '123456';"
+    mysql -uroot -p123456 -e "grant all privileges on root.* to root@'%' 
identified by '123456';FLUSH   PRIVILEGES;"
 fi
-service mysqld restart
 
 # start hdfs
 if [ ! -f "/home/admin/first_run" ]