Merge branch 'master' into trunk

iLychevAD · Jan 12, 2019 · 5f71170 · 5f71170
2 parents f6cb17d + 854af68
commit 5f71170
Show file tree

Hide file tree

Showing 34 changed files with 68 additions and 68 deletions.
diff --git a/agent/alpine/docker-entrypoint.sh b/agent/alpine/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/agent/centos/docker-entrypoint.sh b/agent/centos/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/agent/ubuntu/docker-entrypoint.sh b/agent/ubuntu/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/java-gateway/alpine/docker-entrypoint.sh b/java-gateway/alpine/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/java-gateway/centos/docker-entrypoint.sh b/java-gateway/centos/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/java-gateway/ubuntu/docker-entrypoint.sh b/java-gateway/ubuntu/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/proxy-mysql/alpine/docker-entrypoint.sh b/proxy-mysql/alpine/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/proxy-mysql/centos/docker-entrypoint.sh b/proxy-mysql/centos/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/proxy-mysql/ubuntu/docker-entrypoint.sh b/proxy-mysql/ubuntu/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/proxy-sqlite3/alpine/docker-entrypoint.sh b/proxy-sqlite3/alpine/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/proxy-sqlite3/centos/docker-entrypoint.sh b/proxy-sqlite3/centos/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/proxy-sqlite3/ubuntu/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/server-mysql/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/server-pgsql/alpine/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/server-pgsql/centos/docker-entrypoint.sh b/server-pgsql/centos/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/server-pgsql/ubuntu/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/web-apache-mysql/alpine/docker-entrypoint.sh b/web-apache-mysql/alpine/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/web-apache-mysql/centos/docker-entrypoint.sh b/web-apache-mysql/centos/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/web-apache-mysql/ubuntu/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/web-apache-pgsql/alpine/docker-entrypoint.sh b/web-apache-pgsql/alpine/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/web-apache-pgsql/centos/docker-entrypoint.sh b/web-apache-pgsql/centos/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/web-apache-pgsql/ubuntu/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/web-nginx-mysql/centos/docker-entrypoint.sh b/web-nginx-mysql/centos/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi
 

diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
@@ -74,10 +74,10 @@ configure_db_mysql() {
 
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
 
-        echo "** Instaling initial MySQL database schemas"
+        echo "** Installing initial MySQL database schemas"
         mysql_install_db --user=mysql 2>&1 1>/dev/null
     else
-        echo "**** MySQL data directory is not empty. Using already existsing installation."
+        echo "**** MySQL data directory is not empty. Using already existing installation."
         chown -R mysql:mysql "$MYSQL_DATA_DIR"
     fi