diff options
| author | Konstantin Pavlov <thresh@nginx.com> | 2019-11-20 18:24:46 +0300 |
|---|---|---|
| committer | Konstantin Pavlov <thresh@nginx.com> | 2019-11-20 18:24:46 +0300 |
| commit | c87111cbb2356c186bd2433e525cd07f5f7618c5 (patch) | |
| tree | cd13972f2670eb06f050cbd00cd7b7e7260dfd38 /pkg/docker | |
| parent | 2f23923e44d4528a547d2a29212ac93c3f0e25de (diff) | |
| download | unit-c87111cbb2356c186bd2433e525cd07f5f7618c5.tar.gz unit-c87111cbb2356c186bd2433e525cd07f5f7618c5.tar.bz2 | |
Moved docker images to Debian 10 "buster".
This changes the language versions we provide:
- python 3.5 -> python 3.7
- go 1.7/1.8 -> go 1.11
- perl 5.24 -> perl 5.28
- ruby 2.3 -> ruby 2.5
- php 7.0 -> php 7.3
Diffstat (limited to '')
| -rw-r--r-- | pkg/docker/Dockerfile.tmpl | 6 | ||||
| -rw-r--r-- | pkg/docker/Makefile | 29 |
2 files changed, 11 insertions, 24 deletions
diff --git a/pkg/docker/Dockerfile.tmpl b/pkg/docker/Dockerfile.tmpl index c721931b..3372ef6f 100644 --- a/pkg/docker/Dockerfile.tmpl +++ b/pkg/docker/Dockerfile.tmpl @@ -1,4 +1,4 @@ -FROM debian:stretch-slim +FROM debian:buster-slim LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" @@ -26,13 +26,13 @@ RUN set -x \ && case "$dpkgArch" in \ amd64|i386) \ # arches officialy built by upstream - echo "deb https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \ + echo "deb https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \ && apt-get update \ ;; \ *) \ # we're on an architecture upstream doesn't officially build for # let's build binaries from the published source packages - echo "deb-src https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \ + echo "deb-src https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \ \ # new directory for storing sources and .deb files && tempDir="$(mktemp -d)" \ diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index e826cb95..d2c23529 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -6,42 +6,29 @@ DEFAULT_RELEASE := 1 VERSION ?= $(NXT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) -CODENAME := stretch +CODENAME := buster UNIT_VERSION = $(VERSION)-$(RELEASE)~$(CODENAME) -MODULES = python2.7 python3.5 php7.0 go1.7-dev go1.8-dev perl5.24 ruby2.3 \ +MODULES = python2.7 python3.7 php7.3 go1.11-dev perl5.28 ruby2.5 \ full minimal -MODULE_php7.0="unit=$${UNIT_VERSION} unit-php=$${UNIT_VERSION}" +MODULE_php7.3="unit=$${UNIT_VERSION} unit-php=$${UNIT_VERSION}" MODULE_python2.7="unit=$${UNIT_VERSION} unit-python2.7=$${UNIT_VERSION}" -MODULE_python3.5="unit=$${UNIT_VERSION} unit-python3.5=$${UNIT_VERSION}" +MODULE_python3.7="unit=$${UNIT_VERSION} unit-python3.7=$${UNIT_VERSION}" -MODULE_go1.7-dev="unit=$${UNIT_VERSION} unit-go1.7=$${UNIT_VERSION} gcc" +MODULE_go1.11-dev="unit=$${UNIT_VERSION} unit-go1.11=$${UNIT_VERSION} gcc" -MODULE_go1.8-dev="unit=$${UNIT_VERSION} unit-go1.8=$${UNIT_VERSION} gcc" +MODULE_perl5.28="unit=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION}" -MODULE_perl5.24="unit=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION}" +MODULE_ruby2.5="unit=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION}" -MODULE_ruby2.3="unit=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION}" - -MODULE_full="unit=$${UNIT_VERSION} unit-php=$${UNIT_VERSION} unit-python2.7=$${UNIT_VERSION} unit-python3.5=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION}" +MODULE_full="unit=$${UNIT_VERSION} unit-php=$${UNIT_VERSION} unit-python2.7=$${UNIT_VERSION} unit-python3.7=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION}" MODULE_minimal="unit=$${UNIT_VERSION}" -export \ - MODULE_python2.7 \ - MODULE_python3.5 \ - MODULE_php7.0 \ - MODULE_go1.7-dev \ - MODULE_go1.8-dev \ - MODULE_perl5.24 \ - MODULE_ruby2.3 \ - MODULE_full \ - MODULE_minimal - default: @echo "valid targets: all build dockerfiles push clean" |