diff --git a/10/Dockerfile b/10/Dockerfile
index 87acbe5..6ec45db 100644
--- a/10/Dockerfile
+++ b/10/Dockerfile
@@ -51,8 +51,7 @@ RUN set -eux; \
 	chmod +x /usr/local/bin/entrypoint.sh; \
 	\
 # 为应用创建对应的组、用户、相关目录
-	APP_DIRS="${APP_DEF_DIR:-} ${APP_CONF_DIR:-} ${APP_DATA_DIR:-} ${APP_CACHE_DIR:-} ${APP_RUN_DIR:-} \
-		${APP_LOG_DIR:-} ${APP_CERT_DIR:-} ${APP_WWW_DIR:-} ${APP_DATA_LOG_DIR:-} ${APP_BASE_DIR:-${APP_DATA_DIR}}"; \
+	APP_DIRS="${APP_DEF_DIR:-} ${APP_CONF_DIR:-} ${APP_DATA_DIR:-} ${APP_CACHE_DIR:-} ${APP_RUN_DIR:-} ${APP_LOG_DIR:-} ${APP_CERT_DIR:-} ${APP_WWW_DIR:-} ${APP_DATA_LOG_DIR:-} ${APP_BASE_DIR:-${APP_DATA_DIR}}"; \
 	mkdir -p ${APP_DIRS}; \
 	groupadd -r ${APP_GROUP}; \
 	useradd -r -g ${APP_GROUP} -s /usr/sbin/nologin -d ${APP_BASE_DIR} ${APP_USER}; \
diff --git a/10/prebuilds/usr/local/bin/appcommon.sh b/10/prebuilds/usr/local/bin/appcommon.sh
index ed35771..efa1d55 100644
--- a/10/prebuilds/usr/local/bin/appcommon.sh
+++ b/10/prebuilds/usr/local/bin/appcommon.sh
@@ -597,7 +597,7 @@ docker_app_init() {
             # 为数据库授权；默认用户不为 postgres 时，需要创建管理员账户
             LOG_D "Set password for postgres user"
             if [[ "$PG_USERNAME" = "postgres" ]]; then
-                postgresql_alter_postgres_user "$PG_PASSWORD"
+                [[ -n "$PG_PASSWORD" ]] && postgresql_alter_postgres_user "$PG_PASSWORD"
             else
                 if [[ -n "$PG_POSTGRES_PASSWORD" ]]; then
                     postgresql_alter_postgres_user "$PG_POSTGRES_PASSWORD"
diff --git a/10/prebuilds/usr/local/bin/entrypoint.sh b/10/prebuilds/usr/local/bin/entrypoint.sh
index e2f548d..25ae2a0 100644
--- a/10/prebuilds/usr/local/bin/entrypoint.sh
+++ b/10/prebuilds/usr/local/bin/entrypoint.sh
@@ -23,8 +23,7 @@ LOG_D "Run entrypoint.sh for container init..."
 eval "$(docker_app_env)"
 
 # 定义容器中使用的默认目录(未定义时设置默认值为空"")
-APP_DIRS="${APP_DEF_DIR:-} ${APP_HOME_DIR:-} ${APP_CONF_DIR:-} ${APP_DATA_DIR:-} ${APP_CACHE_DIR:-} ${APP_RUN_DIR:-} \
-	${APP_LOG_DIR:-} ${APP_CERT_DIR:-} ${APP_WWW_DIR:-} ${APP_DATA_LOG_DIR:-}"
+APP_DIRS="${APP_DEF_DIR:-} ${APP_HOME_DIR:-} ${APP_CONF_DIR:-} ${APP_DATA_DIR:-} ${APP_CACHE_DIR:-} ${APP_RUN_DIR:-} ${APP_LOG_DIR:-} ${APP_CERT_DIR:-} ${APP_WWW_DIR:-} ${APP_DATA_LOG_DIR:-}"
 
 APP_DIRS="${APP_DIRS} ${PG_DATA_DIR}"
 
@@ -37,6 +36,7 @@ docker_print_welcome
 docker_ensure_dir_and_configs() {
 	local user_id; user_id="$(id -u)"
 
+	LOG_D "Directories: ${APP_DIRS}"
 	for dir in ${APP_DIRS}; do
     	LOG_D "Check directory $dir"
     	ensure_dir_exists "$dir"