From b2771702fb6b9c7641b27f4fa1d68b9992dd5b28 Mon Sep 17 00:00:00 2001
From: Andrei Belov <defan@nginx.com>
Date: Mon, 9 Nov 2020 16:12:59 +0300
Subject: Packages: added Ubuntu 20.10 "groovy" support.

---
 pkg/deb/Makefile                                | 15 ++++++
 pkg/deb/Makefile.jsc-common                     |  2 +-
 pkg/deb/Makefile.jsc13                          | 71 +++++++++++++++++++++++++
 pkg/deb/Makefile.jsc14                          | 71 +++++++++++++++++++++++++
 pkg/deb/Makefile.jsc15                          | 71 +++++++++++++++++++++++++
 pkg/deb/debian.module/unit.example-jsc13-config | 15 ++++++
 pkg/deb/debian.module/unit.example-jsc14-config | 15 ++++++
 pkg/deb/debian.module/unit.example-jsc15-config | 15 ++++++
 8 files changed, 274 insertions(+), 1 deletion(-)
 create mode 100644 pkg/deb/Makefile.jsc13
 create mode 100644 pkg/deb/Makefile.jsc14
 create mode 100644 pkg/deb/Makefile.jsc15
 create mode 100644 pkg/deb/debian.module/unit.example-jsc13-config
 create mode 100644 pkg/deb/debian.module/unit.example-jsc14-config
 create mode 100644 pkg/deb/debian.module/unit.example-jsc15-config

(limited to 'pkg')

diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index efeb642f..8a02105c 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -16,6 +16,21 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
 
 MODULES=
 
+# Ubuntu 20.10
+ifeq ($(CODENAME),groovy)
+include Makefile.php
+include Makefile.python27
+include Makefile.python38
+include Makefile.go
+include Makefile.perl
+include Makefile.ruby
+include Makefile.jsc-common
+include Makefile.jsc11
+include Makefile.jsc13
+include Makefile.jsc14
+include Makefile.jsc15
+endif
+
 # Ubuntu 20.04
 ifeq ($(CODENAME),focal)
 include Makefile.php
diff --git a/pkg/deb/Makefile.jsc-common b/pkg/deb/Makefile.jsc-common
index 928376c3..f7a6010b 100644
--- a/pkg/deb/Makefile.jsc-common
+++ b/pkg/deb/Makefile.jsc-common
@@ -6,7 +6,7 @@ MODULE_SUMMARY_jsc_common=	Java shared packages for NGINX Unit
 MODULE_VERSION_jsc_common=	$(VERSION)
 MODULE_RELEASE_jsc_common=	1
 
-ifneq (,$(findstring $(CODENAME),focal eoan disco buster))
+ifneq (,$(findstring $(CODENAME),groovy focal eoan disco buster))
 JAVA_MINVERSION=	11
 else
 JAVA_MINVERSION=	8
diff --git a/pkg/deb/Makefile.jsc13 b/pkg/deb/Makefile.jsc13
new file mode 100644
index 00000000..d22944dc
--- /dev/null
+++ b/pkg/deb/Makefile.jsc13
@@ -0,0 +1,71 @@
+MODULES+=		jsc13
+MODULE_SUFFIX_jsc13=	jsc13
+
+MODULE_SUMMARY_jsc13=	Java 13 module for NGINX Unit
+
+MODULE_VERSION_jsc13=	$(VERSION)
+MODULE_RELEASE_jsc13=	1
+
+MODULE_CONFARGS_jsc13=	java --module=java13 --home=/usr/lib/jvm/java-13-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/
+MODULE_MAKEARGS_jsc13=	java13
+MODULE_INSTARGS_jsc13=	java13-install
+
+MODULE_SOURCES_jsc13=	unit.example-jsc-app \
+			unit.example-jsc13-config
+
+BUILD_DEPENDS_jsc13=	openjdk-13-jdk-headless openjdk-13-jre-headless
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_jsc13)
+
+MODULE_BUILD_DEPENDS_jsc13=,openjdk-13-jdk-headless
+MODULE_DEPENDS_jsc13=,openjdk-13-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME))
+
+define MODULE_PREINSTALL_jsc13
+	mkdir -p debian/unit-jsc13/usr/share/doc/unit-jsc13/examples/jsc-app
+	install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc13/usr/share/doc/unit-jsc13/examples/jsc-app/index.jsp
+	install -m 644 -p debian/unit.example-jsc13-config debian/unit-jsc13/usr/share/doc/unit-jsc13/examples/unit.config
+	install -m 644 -p src/java/README.JSR-340 debian/unit-jsc13/usr/share/doc/unit-jsc13/
+endef
+export MODULE_PREINSTALL_jsc13
+
+define MODULE_POSTINSTALL_jsc13
+	cd $$\(BUILDDIR_unit\) \&\& \
+        DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall
+endef
+export MODULE_POSTINSTALL_jsc13
+
+define MODULE_POST_jsc13
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_jsc13) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc13)/examples
+ sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
+ curl http://localhost:8800/
+
+Online documentation is available at https://unit.nginx.org
+
+NOTICE:
+
+This version of Unit code is made available in support of the open source
+development process.  This is an intermediate build made available for
+testing purposes only.  This Unit code is untested and presumed incompatible
+with the JSR 340 Java Servlet 3.1 specification.  You should not deploy or
+write to this code.  You should instead deploy and write production
+applications on pre-built binaries that have been tested and certified
+to meet the JSR-340 compatibility requirements such as certified binaries
+published for the JSR-340 reference implementation available at
+https://javaee.github.io/glassfish/.
+
+Redistribution of any Intermediate Build must retain this notice.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_jsc13
diff --git a/pkg/deb/Makefile.jsc14 b/pkg/deb/Makefile.jsc14
new file mode 100644
index 00000000..9b53a385
--- /dev/null
+++ b/pkg/deb/Makefile.jsc14
@@ -0,0 +1,71 @@
+MODULES+=		jsc14
+MODULE_SUFFIX_jsc14=	jsc14
+
+MODULE_SUMMARY_jsc14=	Java 14 module for NGINX Unit
+
+MODULE_VERSION_jsc14=	$(VERSION)
+MODULE_RELEASE_jsc14=	1
+
+MODULE_CONFARGS_jsc14=	java --module=java14 --home=/usr/lib/jvm/java-14-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/
+MODULE_MAKEARGS_jsc14=	java14
+MODULE_INSTARGS_jsc14=	java14-install
+
+MODULE_SOURCES_jsc14=	unit.example-jsc-app \
+			unit.example-jsc14-config
+
+BUILD_DEPENDS_jsc14=	openjdk-14-jdk-headless openjdk-14-jre-headless
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_jsc14)
+
+MODULE_BUILD_DEPENDS_jsc14=,openjdk-14-jdk-headless
+MODULE_DEPENDS_jsc14=,openjdk-14-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME))
+
+define MODULE_PREINSTALL_jsc14
+	mkdir -p debian/unit-jsc14/usr/share/doc/unit-jsc14/examples/jsc-app
+	install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc14/usr/share/doc/unit-jsc14/examples/jsc-app/index.jsp
+	install -m 644 -p debian/unit.example-jsc14-config debian/unit-jsc14/usr/share/doc/unit-jsc14/examples/unit.config
+	install -m 644 -p src/java/README.JSR-340 debian/unit-jsc14/usr/share/doc/unit-jsc14/
+endef
+export MODULE_PREINSTALL_jsc14
+
+define MODULE_POSTINSTALL_jsc14
+	cd $$\(BUILDDIR_unit\) \&\& \
+        DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall
+endef
+export MODULE_POSTINSTALL_jsc14
+
+define MODULE_POST_jsc14
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_jsc14) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc14)/examples
+ sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
+ curl http://localhost:8800/
+
+Online documentation is available at https://unit.nginx.org
+
+NOTICE:
+
+This version of Unit code is made available in support of the open source
+development process.  This is an intermediate build made available for
+testing purposes only.  This Unit code is untested and presumed incompatible
+with the JSR 340 Java Servlet 3.1 specification.  You should not deploy or
+write to this code.  You should instead deploy and write production
+applications on pre-built binaries that have been tested and certified
+to meet the JSR-340 compatibility requirements such as certified binaries
+published for the JSR-340 reference implementation available at
+https://javaee.github.io/glassfish/.
+
+Redistribution of any Intermediate Build must retain this notice.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_jsc14
diff --git a/pkg/deb/Makefile.jsc15 b/pkg/deb/Makefile.jsc15
new file mode 100644
index 00000000..10b5505b
--- /dev/null
+++ b/pkg/deb/Makefile.jsc15
@@ -0,0 +1,71 @@
+MODULES+=		jsc15
+MODULE_SUFFIX_jsc15=	jsc15
+
+MODULE_SUMMARY_jsc15=	Java 15 module for NGINX Unit
+
+MODULE_VERSION_jsc15=	$(VERSION)
+MODULE_RELEASE_jsc15=	1
+
+MODULE_CONFARGS_jsc15=	java --module=java15 --home=/usr/lib/jvm/java-15-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/
+MODULE_MAKEARGS_jsc15=	java15
+MODULE_INSTARGS_jsc15=	java15-install
+
+MODULE_SOURCES_jsc15=	unit.example-jsc-app \
+			unit.example-jsc15-config
+
+BUILD_DEPENDS_jsc15=	openjdk-15-jdk-headless openjdk-15-jre-headless
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_jsc15)
+
+MODULE_BUILD_DEPENDS_jsc15=,openjdk-15-jdk-headless
+MODULE_DEPENDS_jsc15=,openjdk-15-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME))
+
+define MODULE_PREINSTALL_jsc15
+	mkdir -p debian/unit-jsc15/usr/share/doc/unit-jsc15/examples/jsc-app
+	install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc15/usr/share/doc/unit-jsc15/examples/jsc-app/index.jsp
+	install -m 644 -p debian/unit.example-jsc15-config debian/unit-jsc15/usr/share/doc/unit-jsc15/examples/unit.config
+	install -m 644 -p src/java/README.JSR-340 debian/unit-jsc15/usr/share/doc/unit-jsc15/
+endef
+export MODULE_PREINSTALL_jsc15
+
+define MODULE_POSTINSTALL_jsc15
+	cd $$\(BUILDDIR_unit\) \&\& \
+        DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall
+endef
+export MODULE_POSTINSTALL_jsc15
+
+define MODULE_POST_jsc15
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_jsc15) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc15)/examples
+ sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
+ curl http://localhost:8800/
+
+Online documentation is available at https://unit.nginx.org
+
+NOTICE:
+
+This version of Unit code is made available in support of the open source
+development process.  This is an intermediate build made available for
+testing purposes only.  This Unit code is untested and presumed incompatible
+with the JSR 340 Java Servlet 3.1 specification.  You should not deploy or
+write to this code.  You should instead deploy and write production
+applications on pre-built binaries that have been tested and certified
+to meet the JSR-340 compatibility requirements such as certified binaries
+published for the JSR-340 reference implementation available at
+https://javaee.github.io/glassfish/.
+
+Redistribution of any Intermediate Build must retain this notice.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_jsc15
diff --git a/pkg/deb/debian.module/unit.example-jsc13-config b/pkg/deb/debian.module/unit.example-jsc13-config
new file mode 100644
index 00000000..ac0b1db6
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-jsc13-config
@@ -0,0 +1,15 @@
+{
+	"applications": {
+		"example_java13": {
+			"processes": 1,
+			"type": "java 13",
+			"webapp": "/usr/share/doc/unit-jsc13/examples/jsc-app"
+		}
+	},
+
+	"listeners": {
+		"*:8800": {
+			"pass": "applications/example_java13"
+		}
+	}
+}
diff --git a/pkg/deb/debian.module/unit.example-jsc14-config b/pkg/deb/debian.module/unit.example-jsc14-config
new file mode 100644
index 00000000..76109835
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-jsc14-config
@@ -0,0 +1,15 @@
+{
+	"applications": {
+		"example_java14": {
+			"processes": 1,
+			"type": "java 14",
+			"webapp": "/usr/share/doc/unit-jsc14/examples/jsc-app"
+		}
+	},
+
+	"listeners": {
+		"*:8800": {
+			"pass": "applications/example_java14"
+		}
+	}
+}
diff --git a/pkg/deb/debian.module/unit.example-jsc15-config b/pkg/deb/debian.module/unit.example-jsc15-config
new file mode 100644
index 00000000..9f9aec15
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-jsc15-config
@@ -0,0 +1,15 @@
+{
+	"applications": {
+		"example_java15": {
+			"processes": 1,
+			"type": "java 15",
+			"webapp": "/usr/share/doc/unit-jsc15/examples/jsc-app"
+		}
+	},
+
+	"listeners": {
+		"*:8800": {
+			"pass": "applications/example_java15"
+		}
+	}
+}
-- 
cgit 


From 9e85732e9a8435b059d627b3c264549c33678f74 Mon Sep 17 00:00:00 2001
From: Valentin Bartenev <vbart@nginx.com>
Date: Thu, 19 Nov 2020 21:12:30 +0300
Subject: Generated Dockerfiles for Unit 1.21.0.

---
 pkg/docker/Dockerfile.full       | 2 +-
 pkg/docker/Dockerfile.go1.11-dev | 2 +-
 pkg/docker/Dockerfile.jsc11      | 2 +-
 pkg/docker/Dockerfile.minimal    | 2 +-
 pkg/docker/Dockerfile.perl5.28   | 2 +-
 pkg/docker/Dockerfile.php7.3     | 2 +-
 pkg/docker/Dockerfile.python2.7  | 2 +-
 pkg/docker/Dockerfile.python3.7  | 2 +-
 pkg/docker/Dockerfile.ruby2.5    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'pkg')

diff --git a/pkg/docker/Dockerfile.full b/pkg/docker/Dockerfile.full
index 724c24b6..a5f3e13f 100644
--- a/pkg/docker/Dockerfile.full
+++ b/pkg/docker/Dockerfile.full
@@ -2,7 +2,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.20.0-1~buster
+ENV UNIT_VERSION          1.21.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
diff --git a/pkg/docker/Dockerfile.go1.11-dev b/pkg/docker/Dockerfile.go1.11-dev
index 17b1d2e9..cb1c1d85 100644
--- a/pkg/docker/Dockerfile.go1.11-dev
+++ b/pkg/docker/Dockerfile.go1.11-dev
@@ -2,7 +2,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.20.0-1~buster
+ENV UNIT_VERSION          1.21.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
diff --git a/pkg/docker/Dockerfile.jsc11 b/pkg/docker/Dockerfile.jsc11
index 65b8ce0f..f3d1d22d 100644
--- a/pkg/docker/Dockerfile.jsc11
+++ b/pkg/docker/Dockerfile.jsc11
@@ -2,7 +2,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.20.0-1~buster
+ENV UNIT_VERSION          1.21.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
diff --git a/pkg/docker/Dockerfile.minimal b/pkg/docker/Dockerfile.minimal
index 5a10620a..da9c8712 100644
--- a/pkg/docker/Dockerfile.minimal
+++ b/pkg/docker/Dockerfile.minimal
@@ -2,7 +2,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.20.0-1~buster
+ENV UNIT_VERSION          1.21.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
diff --git a/pkg/docker/Dockerfile.perl5.28 b/pkg/docker/Dockerfile.perl5.28
index 868527e5..976fa7b0 100644
--- a/pkg/docker/Dockerfile.perl5.28
+++ b/pkg/docker/Dockerfile.perl5.28
@@ -2,7 +2,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.20.0-1~buster
+ENV UNIT_VERSION          1.21.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
diff --git a/pkg/docker/Dockerfile.php7.3 b/pkg/docker/Dockerfile.php7.3
index b5789dec..f1178551 100644
--- a/pkg/docker/Dockerfile.php7.3
+++ b/pkg/docker/Dockerfile.php7.3
@@ -2,7 +2,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.20.0-1~buster
+ENV UNIT_VERSION          1.21.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
diff --git a/pkg/docker/Dockerfile.python2.7 b/pkg/docker/Dockerfile.python2.7
index 9bb83f7b..95241af6 100644
--- a/pkg/docker/Dockerfile.python2.7
+++ b/pkg/docker/Dockerfile.python2.7
@@ -2,7 +2,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.20.0-1~buster
+ENV UNIT_VERSION          1.21.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
diff --git a/pkg/docker/Dockerfile.python3.7 b/pkg/docker/Dockerfile.python3.7
index 99324844..52a5a257 100644
--- a/pkg/docker/Dockerfile.python3.7
+++ b/pkg/docker/Dockerfile.python3.7
@@ -2,7 +2,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.20.0-1~buster
+ENV UNIT_VERSION          1.21.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
diff --git a/pkg/docker/Dockerfile.ruby2.5 b/pkg/docker/Dockerfile.ruby2.5
index fef96867..342ccc9a 100644
--- a/pkg/docker/Dockerfile.ruby2.5
+++ b/pkg/docker/Dockerfile.ruby2.5
@@ -2,7 +2,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.20.0-1~buster
+ENV UNIT_VERSION          1.21.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
-- 
cgit