khadgarmage commented on a change in pull request #3215:
URL:
https://github.com/apache/incubator-dolphinscheduler/pull/3215#discussion_r455485134
##########
File path: docker/build/Dockerfile
##########
@@ -42,8 +42,8 @@ ADD
./apache-dolphinscheduler-incubating-${VERSION}-dolphinscheduler-bin.tar.gz
RUN mv
/opt/apache-dolphinscheduler-incubating-${VERSION}-dolphinscheduler-bin/
/opt/dolphinscheduler/
ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler
-#4. install pg
-RUN apk add postgresql postgresql-contrib
+#4. install database
+RUN apk add postgresql postgresql-contrib mysql-client
Review comment:
mysql's license can not meet the requirements of apache, pls remove it
##########
File path: docker/build/startup.sh
##########
@@ -22,24 +22,32 @@ DOLPHINSCHEDULER_BIN=${DOLPHINSCHEDULER_HOME}/bin
DOLPHINSCHEDULER_SCRIPT=${DOLPHINSCHEDULER_HOME}/script
DOLPHINSCHEDULER_LOGS=${DOLPHINSCHEDULER_HOME}/logs
-# start postgresql
-initPostgreSQL() {
- echo "test postgresql service"
- while ! nc -z ${POSTGRESQL_HOST} ${POSTGRESQL_PORT}; do
+# start database
+initDatabase() {
+ echo "test ${DATABASE_TYPE} service"
+ while ! nc -z ${DATABASE_HOST} ${DATABASE_PORT}; do
counter=$((counter+1))
if [ $counter == 30 ]; then
- echo "Error: Couldn't connect to postgresql."
+ echo "Error: Couldn't connect to ${DATABASE_TYPE}."
exit 1
fi
- echo "Trying to connect to postgresql at
${POSTGRESQL_HOST}:${POSTGRESQL_PORT}. Attempt $counter."
+ echo "Trying to connect to ${DATABASE_TYPE} at
${DATABASE_HOST}:${DATABASE_PORT}. Attempt $counter."
sleep 5
done
- echo "connect postgresql service"
- v=$(sudo -u postgres PGPASSWORD=${POSTGRESQL_PASSWORD} psql -h
${POSTGRESQL_HOST} -p ${POSTGRESQL_PORT} -U ${POSTGRESQL_USERNAME} -d
dolphinscheduler -tAc "select 1")
- if [ "$(echo '${v}' | grep 'FATAL' | wc -l)" -eq 1 ]; then
- echo "Error: Can't connect to database...${v}"
- exit 1
+ echo "connect ${DATABASE_TYPE} service"
+ if [ ${DATABASE_TYPE} = "mysql" ]; then
Review comment:
license problem
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
