diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/deb/Makefile | 12 | ||||
| -rw-r--r-- | pkg/deb/Makefile.jsc-common | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.full | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.go1.11-dev | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.minimal | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.perl5.28 | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.php7.3 | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.python2.7 | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.python3.7 | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.ruby2.5 | 2 |
10 files changed, 21 insertions, 9 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 797ff438..55bf7082 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -16,6 +16,18 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= +# Ubuntu 20.04 +ifeq ($(CODENAME),focal) +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 +endif + # Ubuntu 19.10 ifeq ($(CODENAME),eoan) include Makefile.php diff --git a/pkg/deb/Makefile.jsc-common b/pkg/deb/Makefile.jsc-common index 42b4ad74..928376c3 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),eoan disco buster)) +ifneq (,$(findstring $(CODENAME),focal eoan disco buster)) JAVA_MINVERSION= 11 else JAVA_MINVERSION= 8 diff --git a/pkg/docker/Dockerfile.full b/pkg/docker/Dockerfile.full index fb9144c2..08593732 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.17.0-1~buster +ENV UNIT_VERSION 1.18.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 2b213836..ee51f83e 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.17.0-1~buster +ENV UNIT_VERSION 1.18.0-1~buster RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.minimal b/pkg/docker/Dockerfile.minimal index af97aa4f..08be78bc 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.17.0-1~buster +ENV UNIT_VERSION 1.18.0-1~buster RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.perl5.28 b/pkg/docker/Dockerfile.perl5.28 index 793b48d1..a8f84c17 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.17.0-1~buster +ENV UNIT_VERSION 1.18.0-1~buster RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.php7.3 b/pkg/docker/Dockerfile.php7.3 index 5e3f0e97..fe60cf44 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.17.0-1~buster +ENV UNIT_VERSION 1.18.0-1~buster RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.python2.7 b/pkg/docker/Dockerfile.python2.7 index 9e3a431c..f80ca098 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.17.0-1~buster +ENV UNIT_VERSION 1.18.0-1~buster RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.python3.7 b/pkg/docker/Dockerfile.python3.7 index 2517896b..8d5b4d9b 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.17.0-1~buster +ENV UNIT_VERSION 1.18.0-1~buster RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.ruby2.5 b/pkg/docker/Dockerfile.ruby2.5 index 7258bd28..365d71ac 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.17.0-1~buster +ENV UNIT_VERSION 1.18.0-1~buster RUN set -x \ && apt-get update \ |