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

[fix:12]解决Makefile脚本中版本生成错误问题；更新debian与alpine镜像标签命名

Browse Source
This commit is contained in:
房振会
2020-09-14 16:06:25 +08:00
parent 1485b40495
commit ae1556e503
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+11 -11
View File
@@ -8,8 +8,8 @@ app_name :=colovu/postgres
# <镜像名>:<分支名>-<Git ID> # Git 仓库且无文件修改直接编译
# <镜像名>:<分支名>-<年月日>-<时分秒> # Git 仓库有文件修改后的编译
# <镜像名>:latest-<年月日>-<时分秒> # 非 Git 仓库编译
current_subversion:=$(shell if [[ -d .git ]]; then git rev-parse --short HEAD; else date +%y%m%d-%H%M%S; fi)
current_tag:=$(shell if [[ -d .git ]]; then git rev-parse --abbrev-ref HEAD | sed -e 's/master/latest/'; else echo "latest"; fi)-$(current_subversion)
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)
# Sources List: default / tencent / ustc / aliyun / huawei
build-arg:=--build-arg apt_source=tencent
@@ -21,20 +21,20 @@ build-arg+=--build-arg local_url=http://$(local_ip)/dist-files
.PHONY: build build-debian build-alpine clean clearclean upgrade
build-debian:
@echo "Build $(app_name):$(current_tag)-deb"
@docker build --force-rm $(build-arg) -t $(app_name):$(current_tag)-deb .
@echo "Add tag: $(app_name):latest-deb"
@docker tag $(app_name):$(current_tag)-deb $(app_name):latest-deb
build: build-alpine build-debian
@echo "Build complete"
build-alpine:
build-debian:
@echo "Build $(app_name):$(current_tag)"
@docker build --force-rm $(build-arg) -t $(app_name):$(current_tag) ./alpine
@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
build: build-debian build-alpine
@echo "Build complete"
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
# 清理悬空的镜像（无TAG）及停止的容器
clearclean: clean