diff options
| author | Andrei Belov <defan@nginx.com> | 2018-10-25 19:00:07 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2018-10-25 19:00:07 +0300 |
| commit | dc3e83f26ce9f92a157d4332c723d531ca411b80 (patch) | |
| tree | a723f2ce7d8c91527fdfb94eeae708292a705417 /pkg/docker | |
| parent | 8b37c0c70a183f19f7f4245ce0825954d8dbcaf7 (diff) | |
| parent | fd99a738e586326ee5b40a6bc3d09c64b18f394a (diff) | |
| download | unit-dc3e83f26ce9f92a157d4332c723d531ca411b80.tar.gz unit-dc3e83f26ce9f92a157d4332c723d531ca411b80.tar.bz2 | |
Merged with the default branch.1.5-1
Diffstat (limited to 'pkg/docker')
| -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 1ccd4350..2ccfc16c 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.4-2~stretch +ENV UNIT_VERSION 1.5-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 20b5dea8..aa915518 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.4-2~stretch +ENV UNIT_VERSION 1.5-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 a87033c1..e623182b 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.4-2~stretch +ENV UNIT_VERSION 1.5-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.minimal b/pkg/docker/Dockerfile.minimal index 8fe65bfc..0ff59411 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.4-2~stretch +ENV UNIT_VERSION 1.5-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.perl5.24 b/pkg/docker/Dockerfile.perl5.24 index 53b650c0..06067fc7 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.4-2~stretch +ENV UNIT_VERSION 1.5-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.php7.0 b/pkg/docker/Dockerfile.php7.0 index e20c2908..a6b816bf 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.4-2~stretch +ENV UNIT_VERSION 1.5-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.python2.7 b/pkg/docker/Dockerfile.python2.7 index 8bd7d9df..b02fe194 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.4-2~stretch +ENV UNIT_VERSION 1.5-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.python3.5 b/pkg/docker/Dockerfile.python3.5 index 53e72e2b..32ecfcf5 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.4-2~stretch +ENV UNIT_VERSION 1.5-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Dockerfile.ruby2.3 b/pkg/docker/Dockerfile.ruby2.3 index 84dc10d0..ce5fefda 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.4-2~stretch +ENV UNIT_VERSION 1.5-1~stretch RUN set -x \ && apt-get update \ diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 319e14c0..140ac5b3 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -2,7 +2,7 @@ DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \ | sed -e 's/^.*"\(.*\)".*/\1/') -DEFAULT_RELEASE := 2 +DEFAULT_RELEASE := 1 VERSION ?= $(DEFAULT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) |