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

[fix]解决Makefile脚本中版本生成错误问题

Browse Source
This commit is contained in:
房振会
2020-09-14 10:52:09 +08:00
parent 4f6d87ef94
commit a7c78a346b
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+21 -11
View File
@@ -2,14 +2,14 @@
#
# 当前 Docker 镜像的编译脚本
app_name := colovu/test
app_name :=colovu/test
# 生成镜像TAG，类似：
# <镜像名>:<分支名>-<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
@@ -18,24 +18,33 @@ build-arg:=--build-arg apt_source=tencent
local_ip:=`ifconfig -a|grep inet|grep -v 127.0.0.1|grep -v inet6|awk '{print $$2}'|tr -d "addr:"`
build-arg+=--build-arg local_url=http://$(local_ip)/dist-files
.PHONY: build clean clearclean upgrade tag push
.PHONY: build build-debian build-alpine clean clearclean upgrade
build:
build: build-debian build-alpine
@echo "Build complete"
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-alpine:
@echo "Build $(app_name):$(current_tag)"
@docker build --force-rm $(build-arg) -t $(app_name):$(current_tag) ./alpine
@echo "Add tag: $(app_name):latest"
@docker tag $(app_name):$(current_tag) $(app_name):latest
# 清理悬空的镜像（无TAG）及停止的容器
clean:
clearclean: clean
@echo "Clean untaged images and stoped containers..."
@docker ps -a | grep "Exited" | awk '{print $$1}' | xargs docker rm
@docker images | grep '<none>' | awk '{print $$3}' | xargs docker rmi -f
@docker ps -a | grep "Exited" | awk '{print $$1}' | sort -u | xargs -L 1 docker rm
@docker images | grep '<none>' | awk '{print $$3}' | sort -u | xargs -L 1 docker rmi -f
# 为了防止删除前缀名相同的镜像，在过滤条件中加入一个空格进行过滤
clearclean: clean
clean:
@echo "Clean all images for current application..."
@docker images | grep "$(app_name) " | awk '{print $$3}' | xargs docker rmi -f
@docker images | grep "$(app_name) " | awk '{print $$3}' | sort -u | xargs -L 1 docker rmi -f
tag:
@echo "Add tag: $(local_registory)/$(app_name):latest"
@@ -50,4 +59,5 @@ push: tag
# 更新所有 colovu 仓库的镜像
upgrade:
@echo "Upgrade all images..."
@docker images | grep 'colovu' | grep -v '<none>' | grep -v "latest-" | awk '{print $$1":"$$2}' | xargs -L 1 docker pull
@docker images | grep 'colovu' | grep -v '<none>' | grep -v "latest-" | awk '{print $$1":"$$2}' | sort -u | xargs -L 1 docker pull