docker/postgresql
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix:12]更新健康状态检查参数

Browse Source
This commit is contained in:
房振会
2020-10-11 01:07:10 +08:00
parent decf6851b8
commit b1e5a1d1f7
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+1 -1
View File
@@ -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"]
Makefile
+5 -5
View File
@@ -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
alpine/Dockerfile
+1 -1
View File
@@ -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"]