extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-12-01 20:23:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #229 from zabbix/master

Browse Source 
Fixed issue with config params undef
This commit is contained in:
Alexey Pustovalov 2018-02-21 03:01:40 +02:00 committed by GitHub
commit b0b2e073ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/alpine/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
agent/centos/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
agent/ubuntu/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
java-gateway/alpine/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
java-gateway/centos/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
java-gateway/ubuntu/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
proxy-mysql/alpine/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
proxy-mysql/centos/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
proxy-mysql/ubuntu/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
proxy-sqlite3/alpine/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
proxy-sqlite3/centos/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
proxy-sqlite3/ubuntu/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
server-mysql/alpine/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
server-mysql/centos/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
server-pgsql/alpine/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
server-pgsql/centos/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
server-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
web-apache-mysql/alpine/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
web-apache-mysql/centos/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
web-apache-mysql/ubuntu/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
web-apache-pgsql/alpine/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
web-apache-pgsql/centos/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
web-apache-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
web-nginx-mysql/centos/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
web-nginx-mysql/ubuntu/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
web-nginx-pgsql/centos/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi

2
web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -64,7 +64,7 @@ update_config_var() {
# Remove configuration parameter definition in case of unset parameter value # Remove configuration parameter definition in case of unset parameter value
if [ -z "$var_value" ]; then if [ -z "$var_value" ]; then
sed -i -e "/$var_name=/d" "$config_path" sed -i -e "/^$var_name=/d" "$config_path"
echo "removed" echo "removed"
return return
fi fi