From a7d9831ebf6f60ac1707ad0d119ca4f70283e9b2 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Oct 2017 18:06:22 +0300 Subject: [PATCH] Fixed issue with non UTF-8 symbols in build scripts --- proxy-mysql/alpine/build.sh | 2 +- proxy-mysql/ubuntu/build.sh | 2 +- server-mysql/alpine/build.sh | 2 +- server-mysql/ubuntu/build.sh | 2 +- web-apache-mysql/alpine/build.sh | 2 +- web-apache-mysql/ubuntu/build.sh | 2 +- web-nginx-mysql/alpine/build.sh | 2 +- web-nginx-mysql/ubuntu/build.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/proxy-mysql/alpine/build.sh b/proxy-mysql/alpine/build.sh index 6354627de..f24c516e6 100755 --- a/proxy-mysql/alpine/build.sh +++ b/proxy-mysql/alpine/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component-$app_database:$os-$version diff --git a/proxy-mysql/ubuntu/build.sh b/proxy-mysql/ubuntu/build.sh index fbf7add8f..717d2f852 100755 --- a/proxy-mysql/ubuntu/build.sh +++ b/proxy-mysql/ubuntu/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component-$app_database:$os-$version \ No newline at end of file diff --git a/server-mysql/alpine/build.sh b/server-mysql/alpine/build.sh index 774e15d18..f53753010 100755 --- a/server-mysql/alpine/build.sh +++ b/server-mysql/alpine/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql zabbix-$app_component-$app_database:$os-$version diff --git a/server-mysql/ubuntu/build.sh b/server-mysql/ubuntu/build.sh index 89bf78c34..92aeff067 100755 --- a/server-mysql/ubuntu/build.sh +++ b/server-mysql/ubuntu/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql zabbix-$app_component-$app_database:$os-$version diff --git a/web-apache-mysql/alpine/build.sh b/web-apache-mysql/alpine/build.sh index ef070ac25..3c80c7493 100755 --- a/web-apache-mysql/alpine/build.sh +++ b/web-apache-mysql/alpine/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component-$app_database:$os-$version diff --git a/web-apache-mysql/ubuntu/build.sh b/web-apache-mysql/ubuntu/build.sh index 5b0060a52..8bb26e15d 100755 --- a/web-apache-mysql/ubuntu/build.sh +++ b/web-apache-mysql/ubuntu/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component-$app_database:$os-$version diff --git a/web-nginx-mysql/alpine/build.sh b/web-nginx-mysql/alpine/build.sh index 7c7856d39..312a13f50 100755 --- a/web-nginx-mysql/alpine/build.sh +++ b/web-nginx-mysql/alpine/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component-$app_database:$os-$version diff --git a/web-nginx-mysql/ubuntu/build.sh b/web-nginx-mysql/ubuntu/build.sh index 41b8efad0..3831fd2ed 100755 --- a/web-nginx-mysql/ubuntu/build.sh +++ b/web-nginx-mysql/ubuntu/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component-$app_database:$os-$version