technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Ensure docker images are using latest versions of base OS packages.

Browse Source
This commit is contained in:
Konstantin Pavlov
2020-09-22 15:55:28 +03:00
parent e0f66cbba0
commit 5a8adce8c2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/docker/Makefile
View File

@@ -38,7 +38,7 @@ default:
@echo "valid targets: all build dockerfiles push tag export clean" @echo "valid targets: all build dockerfiles push tag export clean"
dockerfiles: $(addprefix Dockerfile., $(MODULES)) dockerfiles: $(addprefix Dockerfile., $(MODULES))
build: $(addprefix build-,$(MODULES)) build: refresh-base $(addprefix build-,$(MODULES))
tag: $(addprefix tag-,$(MODULES)) tag: $(addprefix tag-,$(MODULES))
push: $(addprefix push-,$(MODULES)) latest push: $(addprefix push-,$(MODULES)) latest
export: $(addsuffix .tar.gz,$(addprefix $(EXPORT_DIR)/nginx-unit-$(VERSION)-,$(MODULES))) $(addsuffix .tar.gz.sha512, $(addprefix $(EXPORT_DIR)/nginx-unit-$(VERSION)-,$(MODULES))) export: $(addsuffix .tar.gz,$(addprefix $(EXPORT_DIR)/nginx-unit-$(VERSION)-,$(MODULES))) $(addsuffix .tar.gz.sha512, $(addprefix $(EXPORT_DIR)/nginx-unit-$(VERSION)-,$(MODULES)))
@@ -51,7 +51,7 @@ Dockerfile.%: ../../version
> $@ > $@
build-%: Dockerfile.% build-%: Dockerfile.%
docker build -t unit:$(VERSION)-$* -f Dockerfile.$* . docker build --no-cache -t unit:$(VERSION)-$* -f Dockerfile.$* .
tag-%: build-% tag-%: build-%
docker tag unit:$(VERSION)-$* nginx/unit:$(VERSION)-$* docker tag unit:$(VERSION)-$* nginx/unit:$(VERSION)-$*
@@ -63,6 +63,9 @@ latest:
docker tag nginx/unit:$(VERSION)-full nginx/unit:latest docker tag nginx/unit:$(VERSION)-full nginx/unit:latest
docker push nginx/unit:latest docker push nginx/unit:latest
refresh-base:
docker pull $(shell head -n 1 Dockerfile.tmpl | cut -d' ' -f 2)
$(EXPORT_DIR): $(EXPORT_DIR):
mkdir -p $@ mkdir -p $@
@@ -78,4 +81,4 @@ clean:
rm -f $(addprefix Dockerfile., $(MODULES)) rm -f $(addprefix Dockerfile., $(MODULES))
rm -rf $(EXPORT_DIR) rm -rf $(EXPORT_DIR)
.PHONY: default all build dockerfiles latest push tag export clean .PHONY: default all build dockerfiles latest push tag export clean refresh-base