Packages: Ubuntu 19.04 "disco" support added.
This commit is contained in:
parent
0c12afbf6a
commit
48ae47017b
4 changed files with 84 additions and 2 deletions
|
@ -16,6 +16,19 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
|
|||
|
||||
MODULES=
|
||||
|
||||
# Ubuntu 19.04
|
||||
ifeq ($(CODENAME),disco)
|
||||
include Makefile.php
|
||||
include Makefile.python27
|
||||
include Makefile.python37
|
||||
include Makefile.go110
|
||||
include Makefile.go111
|
||||
include Makefile.perl
|
||||
include Makefile.ruby
|
||||
include Makefile.jsc-common
|
||||
include Makefile.jsc11
|
||||
endif
|
||||
|
||||
# Ubuntu 18.10
|
||||
ifeq ($(CODENAME),cosmic)
|
||||
include Makefile.php
|
||||
|
|
48
pkg/deb/Makefile.go111
Normal file
48
pkg/deb/Makefile.go111
Normal file
|
@ -0,0 +1,48 @@
|
|||
MODULES+= go111
|
||||
MODULE_SUFFIX_go111= go1.11
|
||||
|
||||
MODULE_SUMMARY_go111= Go 1.11 module for NGINX Unit
|
||||
|
||||
MODULE_VERSION_go111= $(VERSION)
|
||||
MODULE_RELEASE_go111= 1
|
||||
|
||||
MODULE_CONFARGS_go111= go --go=/usr/lib/go-1.11/bin/go --go-path=/usr/share/gocode
|
||||
MODULE_MAKEARGS_go111= /usr/lib/go-1.11/bin/go
|
||||
MODULE_INSTARGS_go111= /usr/lib/go-1.11/bin/go-install
|
||||
|
||||
MODULE_SOURCES_go111= unit.example-go-app \
|
||||
unit.example-go1.11-config
|
||||
|
||||
BUILD_DEPENDS_go111= golang-1.11
|
||||
BUILD_DEPENDS+= $(BUILD_DEPENDS_go111)
|
||||
|
||||
MODULE_BUILD_DEPENDS_go111=,golang-1.11
|
||||
MODULE_DEPENDS_go111=,golang-1.11
|
||||
|
||||
define MODULE_PREINSTALL_go111
|
||||
mkdir -p debian/unit-go1.11/usr/share/doc/unit-go1.11/examples/go-app
|
||||
install -m 644 -p debian/unit.example-go-app debian/unit-go1.11/usr/share/doc/unit-go1.11/examples/go-app/let-my-people.go
|
||||
install -m 644 -p debian/unit.example-go1.11-config debian/unit-go1.11/usr/share/doc/unit-go1.11/examples/unit.config
|
||||
endef
|
||||
export MODULE_PREINSTALL_go111
|
||||
|
||||
define MODULE_POST_go111
|
||||
cat <<BANNER
|
||||
----------------------------------------------------------------------
|
||||
|
||||
The $(MODULE_SUMMARY_go111) has been installed.
|
||||
|
||||
To check out the sample app, run these commands:
|
||||
|
||||
GOPATH=/usr/share/gocode /usr/lib/go-1.11/bin/go build -o /tmp/go1.11-app /usr/share/doc/unit-$(MODULE_SUFFIX_go111)/examples/go-app/let-my-people.go
|
||||
sudo service unit restart
|
||||
cd /usr/share/doc/unit-$(MODULE_SUFFIX_go111)/examples
|
||||
sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
|
||||
curl http://localhost:8500/
|
||||
|
||||
Online documentation is available at https://unit.nginx.org
|
||||
|
||||
----------------------------------------------------------------------
|
||||
BANNER
|
||||
endef
|
||||
export MODULE_POST_go111
|
|
@ -6,11 +6,17 @@ MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit
|
|||
MODULE_VERSION_jsc_common= $(VERSION)
|
||||
MODULE_RELEASE_jsc_common= 1
|
||||
|
||||
MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-8-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/
|
||||
ifeq ($(CODENAME),disco)
|
||||
JAVA_MINVERSION= 11
|
||||
else
|
||||
JAVA_MINVERSION= 8
|
||||
endif
|
||||
|
||||
MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-$(JAVA_MINVERSION)-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/
|
||||
MODULE_MAKEARGS_jsc_common= java
|
||||
MODULE_INSTARGS_jsc_common= java-shared-install
|
||||
|
||||
BUILD_DEPENDS_jsc_common= openjdk-8-jdk-headless openjdk-8-jre-headless
|
||||
BUILD_DEPENDS_jsc_common= openjdk-$(JAVA_MINVERSION)-jdk-headless openjdk-$(JAVA_MINVERSION)-jre-headless
|
||||
BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc_common)
|
||||
|
||||
MODULE_NOARCH_jsc_common= true
|
||||
|
|
15
pkg/deb/debian.module/unit.example-go1.11-config
Normal file
15
pkg/deb/debian.module/unit.example-go1.11-config
Normal file
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"applications": {
|
||||
"example_go": {
|
||||
"type": "external",
|
||||
"user": "nobody",
|
||||
"executable": "/tmp/go1.11-app"
|
||||
}
|
||||
},
|
||||
|
||||
"listeners": {
|
||||
"*:8500": {
|
||||
"application": "example_go"
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue