From e0f66cbba095d4a4739b414a8878b567dc930b01 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Tue, 22 Sep 2020 15:55:28 +0300
Subject: Added jsc11 docker image.

---
 pkg/docker/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkg/docker/Makefile')

diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile
index 7647e51b..d18e2b18 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}"
 
-- 
cgit 


From 5a8adce8c2be663ad2e6bb0a48ee8dc908ab4daa Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Tue, 22 Sep 2020 15:55:28 +0300
Subject: Ensure docker images are using latest versions of base OS packages.

---
 pkg/docker/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'pkg/docker/Makefile')

diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile
index d18e2b18..aed5b8f7 100644
--- a/pkg/docker/Makefile
+++ b/pkg/docker/Makefile
@@ -38,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)))
@@ -51,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)-$*
@@ -63,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 $@
 
@@ -78,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
-- 
cgit