From b1e5a1d1f736cddfb1e6701797014f2196acc6cb Mon Sep 17 00:00:00 2001
From: Endial Fang <endial@126.com>
Date: Sun, 11 Oct 2020 01:07:10 +0800
Subject: [PATCH] =?UTF-8?q?[fix:12]=E6=9B=B4=E6=96=B0=E5=81=A5=E5=BA=B7?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A3=80=E6=9F=A5=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile        |  2 +-
 Makefile          | 10 +++++-----
 alpine/Dockerfile |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3c5d5e3..e05db91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -142,7 +142,7 @@ VOLUME ["/srv/conf", "/srv/data", "/srv/datalog", "/srv/cert", "/var/log"]
 EXPOSE 5432
 
 # 应用健康状态检查
-HEALTHCHECK CMD PGPASSWORD="${PG_POSTGRES_PASSWORD}" psql -h 127.0.0.1 -d postgres -U postgres -At -c "select version();" || exit 1
+HEALTHCHECK CMD PGPASSWORD="${PG_POSTGRES_PASSWORD:-${PG_PASSWORD}}" psql -h 127.0.0.1 -d postgres -U postgres -At -c "select version();" || exit 1
 
 # 容器初始化命令，默认存放在：/usr/local/bin/entry.sh
 ENTRYPOINT ["entry.sh"]
diff --git a/Makefile b/Makefile
index ea8c14b..3040baa 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ app_name :=colovu/postgres
 # 	<镜像名>:<分支名>-<年月日>-<时分秒>		# Git 仓库有文件修改后的编译
 # 	<镜像名>:latest-<年月日>-<时分秒>		# 非 Git 仓库编译
 current_subversion:=$(shell if [ ! `git status >/dev/null 2>&1` ]; then git rev-parse --short HEAD; else date +%y%m%d-%H%M%S; fi)
-current_tag:=$(shell if [ ! `git status >/dev/null 2>&1` ]; then git rev-parse --abbrev-ref HEAD | sed -e 's/master/latest/'; else echo "latest"; fi)-$(current_subversion)
+current_tag:=local-$(shell if [ ! `git status >/dev/null 2>&1` ]; then git rev-parse --abbrev-ref HEAD | sed -e 's/master/latest/'; else echo "latest"; fi)-$(current_subversion)
 
 # Sources List: default / tencent / ustc / aliyun / huawei
 build-arg:=--build-arg apt_source=tencent
@@ -26,14 +26,14 @@ build: build-alpine build-debian
 build-debian:
 	@echo "Build $(app_name):$(current_tag)"
 	@docker build --force-rm $(build-arg) -t $(app_name):$(current_tag) .
-	@echo "Add tag: $(app_name):latest"
-	@docker tag $(app_name):$(current_tag) $(app_name):latest
+	@echo "Add tag: $(app_name):local-latest"
+	@docker tag $(app_name):$(current_tag) $(app_name):local-latest
 
 build-alpine:
 	@echo "Build $(app_name):$(current_tag)-alpine"
 	@docker build --force-rm $(build-arg) -t $(app_name):$(current_tag)-alpine ./alpine
-	@echo "Add tag: $(app_name):latest-alpine"
-	@docker tag $(app_name):$(current_tag)-alpine $(app_name):latest-alpine
+	@echo "Add tag: $(app_name):local-latest-alpine"
+	@docker tag $(app_name):$(current_tag)-alpine $(app_name):local-latest-alpine
 
 # 清理悬空的镜像（无TAG）及停止的容器 
 clearclean: clean
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 0411d2b..f6db2dd 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -145,7 +145,7 @@ VOLUME ["/srv/conf", "/srv/data", "/srv/datalog", "/srv/cert", "/var/log"]
 EXPOSE 5432
 
 # 应用健康状态检查
-HEALTHCHECK CMD PGPASSWORD="${PG_POSTGRES_PASSWORD}" psql -h 127.0.0.1 -d postgres -U postgres -At -c "select version();" || exit 1
+HEALTHCHECK CMD PGPASSWORD="${PG_POSTGRES_PASSWORD:-${PG_PASSWORD}}" psql -h 127.0.0.1 -d postgres -U postgres -At -c "select version();" || exit 1
 
 # 容器初始化命令，默认存放在：/usr/local/bin/entry.sh
 ENTRYPOINT ["entry.sh"]