summaryrefslogtreecommitdiffhomepage
path: root/pkg
diff options
context:
space:
mode:
authorAndrei Belov <defan@nginx.com>2020-02-06 18:25:25 +0300
committerAndrei Belov <defan@nginx.com>2020-02-06 18:25:25 +0300
commit2dc01938cf02cc05b41a09e618f712129c4cdf91 (patch)
tree556dd40a0ec8c194774d53eed9ff62ed1d25ee7c /pkg
parent477a58e14010ab14d6ab453860b360cf806f5012 (diff)
parent6e19090736612b39d4c5d0836d7df0722b8955e7 (diff)
downloadunit-1.15.0-1.tar.gz
unit-1.15.0-1.tar.bz2
Merged with the default branch.1.15.0-1
Diffstat (limited to '')
-rw-r--r--pkg/deb/Makefile.jsc-common2
-rw-r--r--pkg/deb/debian/copyright13
-rw-r--r--pkg/docker/Dockerfile.full2
-rw-r--r--pkg/docker/Dockerfile.go1.11-dev2
-rw-r--r--pkg/docker/Dockerfile.minimal2
-rw-r--r--pkg/docker/Dockerfile.perl5.282
-rw-r--r--pkg/docker/Dockerfile.php7.32
-rw-r--r--pkg/docker/Dockerfile.python2.72
-rw-r--r--pkg/docker/Dockerfile.python3.72
-rw-r--r--pkg/docker/Dockerfile.ruby2.52
-rw-r--r--pkg/rpm/Makefile.jsc-common2
11 files changed, 19 insertions, 14 deletions
diff --git a/pkg/deb/Makefile.jsc-common b/pkg/deb/Makefile.jsc-common
index 029114a6..42b4ad74 100644
--- a/pkg/deb/Makefile.jsc-common
+++ b/pkg/deb/Makefile.jsc-common
@@ -16,7 +16,7 @@ MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-$(JAVA_MINVERSION)-ope
MODULE_MAKEARGS_jsc_common= java
MODULE_INSTARGS_jsc_common= java-shared-install
-BUILD_DEPENDS_jsc_common= openjdk-$(JAVA_MINVERSION)-jdk-headless openjdk-$(JAVA_MINVERSION)-jre-headless
+BUILD_DEPENDS_jsc_common= openjdk-$(JAVA_MINVERSION)-jdk-headless openjdk-$(JAVA_MINVERSION)-jre-headless curl
BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc_common)
MODULE_NOARCH_jsc_common= true
diff --git a/pkg/deb/debian/copyright b/pkg/deb/debian/copyright
index fe52d6aa..2acb87b9 100644
--- a/pkg/deb/debian/copyright
+++ b/pkg/deb/debian/copyright
@@ -1,10 +1,15 @@
NGINX Unit.
- Copyright 2017-2019 NGINX, Inc.
- Copyright 2017-2019 Igor Sysoev
- Copyright 2017-2019 Valentin V. Bartenev
- Copyright 2017-2019 Max Romanov
+ Copyright 2017-2020 NGINX, Inc.
+ Copyright 2017-2020 Igor Sysoev
+ Copyright 2017-2020 Valentin V. Bartenev
+ Copyright 2017-2020 Max Romanov
+ Copyright 2017-2020 Andrei Zeliankou
+ Copyright 2017-2020 Andrei Belov
+ Copyright 2018-2020 Konstantin Pavlov
+ Copyright 2019-2020 Tiago Natel de Moura
+ Copyright 2019-2020 Axel Duch
Copyright 2018-2019 Alexander Borisov
Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pkg/docker/Dockerfile.full b/pkg/docker/Dockerfile.full
index b71b74fb..12695878 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.14.0-1~buster
+ENV UNIT_VERSION 1.15.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 92fa56f6..589680c8 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.14.0-1~buster
+ENV UNIT_VERSION 1.15.0-1~buster
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Dockerfile.minimal b/pkg/docker/Dockerfile.minimal
index 26a55d9c..3c3853eb 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.14.0-1~buster
+ENV UNIT_VERSION 1.15.0-1~buster
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Dockerfile.perl5.28 b/pkg/docker/Dockerfile.perl5.28
index 3be4a6dc..92a88516 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.14.0-1~buster
+ENV UNIT_VERSION 1.15.0-1~buster
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Dockerfile.php7.3 b/pkg/docker/Dockerfile.php7.3
index 36a2dfbf..0180909b 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.14.0-1~buster
+ENV UNIT_VERSION 1.15.0-1~buster
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Dockerfile.python2.7 b/pkg/docker/Dockerfile.python2.7
index 0dd2f9a5..2942b0b5 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.14.0-1~buster
+ENV UNIT_VERSION 1.15.0-1~buster
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Dockerfile.python3.7 b/pkg/docker/Dockerfile.python3.7
index fd6f1639..e8ca5c4a 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.14.0-1~buster
+ENV UNIT_VERSION 1.15.0-1~buster
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Dockerfile.ruby2.5 b/pkg/docker/Dockerfile.ruby2.5
index 034ae542..b706e542 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.14.0-1~buster
+ENV UNIT_VERSION 1.15.0-1~buster
RUN set -x \
&& apt-get update \
diff --git a/pkg/rpm/Makefile.jsc-common b/pkg/rpm/Makefile.jsc-common
index d8c308de..959c6b9d 100644
--- a/pkg/rpm/Makefile.jsc-common
+++ b/pkg/rpm/Makefile.jsc-common
@@ -14,7 +14,7 @@ MODULE_INSTARGS_jsc_common= java-shared-install
MODULE_SOURCES_jsc_common= COPYRIGHT.unit-jsc-common
-BUILD_DEPENDS_jsc_common= java-1.8.0-openjdk-devel
+BUILD_DEPENDS_jsc_common= java-1.8.0-openjdk-devel curl
BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc_common)
define MODULE_DEFINITIONS_jsc_common
generated by cgit (git 2.34.1) at 2025-12-08 11:55:15 +0000