diff options
| author | Andrei Belov <defan@nginx.com> | 2020-10-08 19:19:31 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2020-10-08 19:19:31 +0300 |
| commit | d586ac9fdc4a86c142b06a75dde4cdacad5b52f6 (patch) | |
| tree | 9817282396f9d2cf5333050e4b5bf807d3617e40 /pkg/docker/Makefile | |
| parent | 9be35d9b7418c041e5177f273c20f0fd2d3f00ad (diff) | |
| parent | ad516735a65fe109773b60e26214a071411f1734 (diff) | |
| download | unit-d586ac9fdc4a86c142b06a75dde4cdacad5b52f6.tar.gz unit-d586ac9fdc4a86c142b06a75dde4cdacad5b52f6.tar.bz2 | |
Merged with the default branch.1.20.0-1
Diffstat (limited to '')
| -rw-r--r-- | pkg/docker/Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 7647e51b..aed5b8f7 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -12,7 +12,7 @@ CODENAME := buster UNIT_VERSION = $(VERSION)-$(RELEASE)~$(CODENAME) MODULES = python2.7 python3.7 php7.3 go1.11-dev perl5.28 ruby2.5 \ - full minimal + jsc11 full minimal MODULE_php7.3="unit=$${UNIT_VERSION} unit-php=$${UNIT_VERSION}" @@ -26,7 +26,9 @@ MODULE_perl5.28="unit=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION}" MODULE_ruby2.5="unit=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION}" -MODULE_full="unit=$${UNIT_VERSION} unit-php=$${UNIT_VERSION} unit-python2.7=$${UNIT_VERSION} unit-python3.7=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION}" +MODULE_jsc11="unit=$${UNIT_VERSION} unit-jsc11=$${UNIT_VERSION}" + +MODULE_full="unit=$${UNIT_VERSION} unit-php=$${UNIT_VERSION} unit-python2.7=$${UNIT_VERSION} unit-python3.7=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION} unit-jsc11=$${UNIT_VERSION}" MODULE_minimal="unit=$${UNIT_VERSION}" @@ -36,7 +38,7 @@ default: @echo "valid targets: all build dockerfiles push tag export clean" dockerfiles: $(addprefix Dockerfile., $(MODULES)) -build: $(addprefix build-,$(MODULES)) +build: refresh-base $(addprefix build-,$(MODULES)) tag: $(addprefix tag-,$(MODULES)) 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))) @@ -49,7 +51,7 @@ Dockerfile.%: ../../version > $@ build-%: Dockerfile.% - docker build -t unit:$(VERSION)-$* -f Dockerfile.$* . + docker build --no-cache -t unit:$(VERSION)-$* -f Dockerfile.$* . tag-%: build-% docker tag unit:$(VERSION)-$* nginx/unit:$(VERSION)-$* @@ -61,6 +63,9 @@ latest: docker tag nginx/unit:$(VERSION)-full nginx/unit:latest docker push nginx/unit:latest +refresh-base: + docker pull $(shell head -n 1 Dockerfile.tmpl | cut -d' ' -f 2) + $(EXPORT_DIR): mkdir -p $@ @@ -76,4 +81,4 @@ clean: rm -f $(addprefix Dockerfile., $(MODULES)) 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 |