Skip to content

Commit 8ab70dd

Browse files
tianontianon
committed
Add "set -u" for further accidental mistake protection
1 parent 15dab9a commit 8ab70dd

File tree

5 files changed

+30
-30
lines changed

5 files changed

+30
-30
lines changed

‎docker-entrypoint.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -e
2+
set -eu
33

44
# usage: file_env VAR [DEFAULT]
55
# ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -9,14 +9,14 @@ file_env() {
99
local var="$1"
1010
local fileVar="${var}_FILE"
1111
local def="${2:-}"
12-
if [ "${!var}" ] && [ "${!fileVar}" ]; then
12+
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
1313
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
1414
exit 1
1515
fi
1616
local val="$def"
17-
if [ "${!var}" ]; then
17+
if [ "${!var:-}" ]; then
1818
val="${!var}"
19-
elif [ "${!fileVar}" ]; then
19+
elif [ "${!fileVar:-}" ]; then
2020
val="$(< "${!fileVar}")"
2121
fi
2222
export "$var"="$val"
@@ -28,9 +28,9 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2828
# if we're linked to MySQL and thus have credentials already, let's use them
2929
file_env 'WORDPRESS_DB_USER' "${MYSQL_ENV_MYSQL_USER:-root}"
3030
if [ "$WORDPRESS_DB_USER" = 'root' ]; then
31-
file_env 'WORDPRESS_DB_PASSWORD' "$MYSQL_ENV_MYSQL_ROOT_PASSWORD"
31+
file_env 'WORDPRESS_DB_PASSWORD' "${MYSQL_ENV_MYSQL_ROOT_PASSWORD:-}"
3232
else
33-
file_env 'WORDPRESS_DB_PASSWORD' "$MYSQL_ENV_MYSQL_PASSWORD"
33+
file_env 'WORDPRESS_DB_PASSWORD' "${MYSQL_ENV_MYSQL_PASSWORD:-}"
3434
fi
3535
file_env 'WORDPRESS_DB_NAME' "${MYSQL_ENV_MYSQL_DATABASE:-wordpress}"
3636
if [ -z "$WORDPRESS_DB_PASSWORD" ]; then

‎php5.6/apache/docker-entrypoint.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -e
2+
set -eu
33

44
# usage: file_env VAR [DEFAULT]
55
# ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -9,14 +9,14 @@ file_env() {
99
local var="$1"
1010
local fileVar="${var}_FILE"
1111
local def="${2:-}"
12-
if [ "${!var}" ] && [ "${!fileVar}" ]; then
12+
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
1313
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
1414
exit 1
1515
fi
1616
local val="$def"
17-
if [ "${!var}" ]; then
17+
if [ "${!var:-}" ]; then
1818
val="${!var}"
19-
elif [ "${!fileVar}" ]; then
19+
elif [ "${!fileVar:-}" ]; then
2020
val="$(< "${!fileVar}")"
2121
fi
2222
export "$var"="$val"
@@ -28,9 +28,9 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2828
# if we're linked to MySQL and thus have credentials already, let's use them
2929
file_env 'WORDPRESS_DB_USER' "${MYSQL_ENV_MYSQL_USER:-root}"
3030
if [ "$WORDPRESS_DB_USER" = 'root' ]; then
31-
file_env 'WORDPRESS_DB_PASSWORD' "$MYSQL_ENV_MYSQL_ROOT_PASSWORD"
31+
file_env 'WORDPRESS_DB_PASSWORD' "${MYSQL_ENV_MYSQL_ROOT_PASSWORD:-}"
3232
else
33-
file_env 'WORDPRESS_DB_PASSWORD' "$MYSQL_ENV_MYSQL_PASSWORD"
33+
file_env 'WORDPRESS_DB_PASSWORD' "${MYSQL_ENV_MYSQL_PASSWORD:-}"
3434
fi
3535
file_env 'WORDPRESS_DB_NAME' "${MYSQL_ENV_MYSQL_DATABASE:-wordpress}"
3636
if [ -z "$WORDPRESS_DB_PASSWORD" ]; then

‎php5.6/fpm/docker-entrypoint.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -e
2+
set -eu
33

44
# usage: file_env VAR [DEFAULT]
55
# ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -9,14 +9,14 @@ file_env() {
99
local var="$1"
1010
local fileVar="${var}_FILE"
1111
local def="${2:-}"
12-
if [ "${!var}" ] && [ "${!fileVar}" ]; then
12+
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
1313
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
1414
exit 1
1515
fi
1616
local val="$def"
17-
if [ "${!var}" ]; then
17+
if [ "${!var:-}" ]; then
1818
val="${!var}"
19-
elif [ "${!fileVar}" ]; then
19+
elif [ "${!fileVar:-}" ]; then
2020
val="$(< "${!fileVar}")"
2121
fi
2222
export "$var"="$val"
@@ -28,9 +28,9 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2828
# if we're linked to MySQL and thus have credentials already, let's use them
2929
file_env 'WORDPRESS_DB_USER' "${MYSQL_ENV_MYSQL_USER:-root}"
3030
if [ "$WORDPRESS_DB_USER" = 'root' ]; then
31-
file_env 'WORDPRESS_DB_PASSWORD' "$MYSQL_ENV_MYSQL_ROOT_PASSWORD"
31+
file_env 'WORDPRESS_DB_PASSWORD' "${MYSQL_ENV_MYSQL_ROOT_PASSWORD:-}"
3232
else
33-
file_env 'WORDPRESS_DB_PASSWORD' "$MYSQL_ENV_MYSQL_PASSWORD"
33+
file_env 'WORDPRESS_DB_PASSWORD' "${MYSQL_ENV_MYSQL_PASSWORD:-}"
3434
fi
3535
file_env 'WORDPRESS_DB_NAME' "${MYSQL_ENV_MYSQL_DATABASE:-wordpress}"
3636
if [ -z "$WORDPRESS_DB_PASSWORD" ]; then

‎php7.0/apache/docker-entrypoint.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -e
2+
set -eu
33

44
# usage: file_env VAR [DEFAULT]
55
# ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -9,14 +9,14 @@ file_env() {
99
local var="$1"
1010
local fileVar="${var}_FILE"
1111
local def="${2:-}"
12-
if [ "${!var}" ] && [ "${!fileVar}" ]; then
12+
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
1313
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
1414
exit 1
1515
fi
1616
local val="$def"
17-
if [ "${!var}" ]; then
17+
if [ "${!var:-}" ]; then
1818
val="${!var}"
19-
elif [ "${!fileVar}" ]; then
19+
elif [ "${!fileVar:-}" ]; then
2020
val="$(< "${!fileVar}")"
2121
fi
2222
export "$var"="$val"
@@ -28,9 +28,9 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2828
# if we're linked to MySQL and thus have credentials already, let's use them
2929
file_env 'WORDPRESS_DB_USER' "${MYSQL_ENV_MYSQL_USER:-root}"
3030
if [ "$WORDPRESS_DB_USER" = 'root' ]; then
31-
file_env 'WORDPRESS_DB_PASSWORD' "$MYSQL_ENV_MYSQL_ROOT_PASSWORD"
31+
file_env 'WORDPRESS_DB_PASSWORD' "${MYSQL_ENV_MYSQL_ROOT_PASSWORD:-}"
3232
else
33-
file_env 'WORDPRESS_DB_PASSWORD' "$MYSQL_ENV_MYSQL_PASSWORD"
33+
file_env 'WORDPRESS_DB_PASSWORD' "${MYSQL_ENV_MYSQL_PASSWORD:-}"
3434
fi
3535
file_env 'WORDPRESS_DB_NAME' "${MYSQL_ENV_MYSQL_DATABASE:-wordpress}"
3636
if [ -z "$WORDPRESS_DB_PASSWORD" ]; then

‎php7.0/fpm/docker-entrypoint.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -e
2+
set -eu
33

44
# usage: file_env VAR [DEFAULT]
55
# ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -9,14 +9,14 @@ file_env() {
99
local var="$1"
1010
local fileVar="${var}_FILE"
1111
local def="${2:-}"
12-
if [ "${!var}" ] && [ "${!fileVar}" ]; then
12+
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
1313
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
1414
exit 1
1515
fi
1616
local val="$def"
17-
if [ "${!var}" ]; then
17+
if [ "${!var:-}" ]; then
1818
val="${!var}"
19-
elif [ "${!fileVar}" ]; then
19+
elif [ "${!fileVar:-}" ]; then
2020
val="$(< "${!fileVar}")"
2121
fi
2222
export "$var"="$val"
@@ -28,9 +28,9 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
2828
# if we're linked to MySQL and thus have credentials already, let's use them
2929
file_env 'WORDPRESS_DB_USER' "${MYSQL_ENV_MYSQL_USER:-root}"
3030
if [ "$WORDPRESS_DB_USER" = 'root' ]; then
31-
file_env 'WORDPRESS_DB_PASSWORD' "$MYSQL_ENV_MYSQL_ROOT_PASSWORD"
31+
file_env 'WORDPRESS_DB_PASSWORD' "${MYSQL_ENV_MYSQL_ROOT_PASSWORD:-}"
3232
else
33-
file_env 'WORDPRESS_DB_PASSWORD' "$MYSQL_ENV_MYSQL_PASSWORD"
33+
file_env 'WORDPRESS_DB_PASSWORD' "${MYSQL_ENV_MYSQL_PASSWORD:-}"
3434
fi
3535
file_env 'WORDPRESS_DB_NAME' "${MYSQL_ENV_MYSQL_DATABASE:-wordpress}"
3636
if [ -z "$WORDPRESS_DB_PASSWORD" ]; then

0 commit comments

Comments
 (0)