diff options
| author | Andrei Belov <defan@nginx.com> | 2019-08-22 21:33:54 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2019-08-22 21:33:54 +0300 |
| commit | a07c4d30a64f781f93730576b5dced32422a9935 (patch) | |
| tree | 06ebfaa66845a057b8069014c5379b2dcfc80861 /pkg/docker | |
| parent | 8a579acddeae0c0106e15d82aa7220ac01deba84 (diff) | |
| parent | c47af243b0e805376c4ec908f21e07dc811b33f0 (diff) | |
| download | unit-a07c4d30a64f781f93730576b5dced32422a9935.tar.gz unit-a07c4d30a64f781f93730576b5dced32422a9935.tar.bz2 | |
Merged with the default branch.1.10.0-1
Diffstat (limited to '')
| -rw-r--r-- | pkg/docker/Dockerfile.full | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.go1.7-dev | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.go1.8-dev | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.minimal | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.perl5.24 | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.php7.0 | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.python2.7 | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.python3.5 | 2 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.ruby2.3 | 2 | ||||
| -rw-r--r-- | pkg/docker/Makefile | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/pkg/docker/Dockerfile.full b/pkg/docker/Dockerfile.full index 14afc75b..8c4baa35 100644 --- a/pkg/docker/Dockerfile.full +++ b/pkg/docker/Dockerfile.full @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV UNIT_VERSION 1.9.0-1~stretch +ENV UNIT_VERSION 1.10.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.go1.7-dev b/pkg/docker/Dockerfile.go1.7-dev index ad3d888d..895ac69e 100644 --- a/pkg/docker/Dockerfile.go1.7-dev +++ b/pkg/docker/Dockerfile.go1.7-dev @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV UNIT_VERSION 1.9.0-1~stretch +ENV UNIT_VERSION 1.10.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.go1.8-dev b/pkg/docker/Dockerfile.go1.8-dev index 915d859a..1ba8a92e 100644 --- a/pkg/docker/Dockerfile.go1.8-dev +++ b/pkg/docker/Dockerfile.go1.8-dev @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV UNIT_VERSION 1.9.0-1~stretch +ENV UNIT_VERSION 1.10.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.minimal b/pkg/docker/Dockerfile.minimal index 5214c24a..44592364 100644 --- a/pkg/docker/Dockerfile.minimal +++ b/pkg/docker/Dockerfile.minimal @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV UNIT_VERSION 1.9.0-1~stretch +ENV UNIT_VERSION 1.10.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.perl5.24 b/pkg/docker/Dockerfile.perl5.24 index c2c91866..fc483796 100644 --- a/pkg/docker/Dockerfile.perl5.24 +++ b/pkg/docker/Dockerfile.perl5.24 @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV UNIT_VERSION 1.9.0-1~stretch +ENV UNIT_VERSION 1.10.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.php7.0 b/pkg/docker/Dockerfile.php7.0 index b14a38b4..e766bfbf 100644 --- a/pkg/docker/Dockerfile.php7.0 +++ b/pkg/docker/Dockerfile.php7.0 @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV UNIT_VERSION 1.9.0-1~stretch +ENV UNIT_VERSION 1.10.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.python2.7 b/pkg/docker/Dockerfile.python2.7 index 82de3318..1d0410e1 100644 --- a/pkg/docker/Dockerfile.python2.7 +++ b/pkg/docker/Dockerfile.python2.7 @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV UNIT_VERSION 1.9.0-1~stretch +ENV UNIT_VERSION 1.10.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.python3.5 b/pkg/docker/Dockerfile.python3.5 index b103d8f9..d83fb984 100644 --- a/pkg/docker/Dockerfile.python3.5 +++ b/pkg/docker/Dockerfile.python3.5 @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV UNIT_VERSION 1.9.0-1~stretch +ENV UNIT_VERSION 1.10.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.ruby2.3 b/pkg/docker/Dockerfile.ruby2.3 index 50ec7ed6..0cdc76c2 100644 --- a/pkg/docker/Dockerfile.ruby2.3 +++ b/pkg/docker/Dockerfile.ruby2.3 @@ -2,7 +2,7 @@ FROM debian:stretch-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" -ENV UNIT_VERSION 1.9.0-1~stretch +ENV UNIT_VERSION 1.10.0-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index cf6de78d..e826cb95 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -49,7 +49,7 @@ dockerfiles: $(addprefix Dockerfile., $(MODULES)) build: dockerfiles $(addprefix build-,$(MODULES)) push: build $(addprefix push-,$(MODULES)) latest -Dockerfile.%: ../../src/nxt_main.h +Dockerfile.%: ../../version @echo "===> Building $@" cat Dockerfile.tmpl | sed \ -e 's,@@UNITPACKAGES@@,$(MODULE_$*),g' \ |