technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Moved docker images to Debian 10 "buster".

Browse Source 
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
This commit is contained in:
Konstantin Pavlov
2019-11-20 18:24:46 +03:00
parent 2f23923e44
commit c87111cbb2
2 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/docker/Dockerfile.tmpl
View File

@@ -1,4 +1,4 @@
FROM debian:stretch-slim FROM debian:buster-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
@@ -26,13 +26,13 @@ RUN set -x \
&& case "$dpkgArch" in \ && case "$dpkgArch" in \
amd64|i386) \ amd64|i386) \
# arches officialy built by upstream # 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 \ && apt-get update \
;; \ ;; \
*) \ *) \
# we're on an architecture upstream doesn't officially build for # we're on an architecture upstream doesn't officially build for
# let's build binaries from the published source packages # 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 # new directory for storing sources and .deb files
&& tempDir="$(mktemp -d)" \ && tempDir="$(mktemp -d)" \

29
pkg/docker/Makefile
View File

@@ -6,42 +6,29 @@ DEFAULT_RELEASE := 1
VERSION ?= $(NXT_VERSION) VERSION ?= $(NXT_VERSION)
RELEASE ?= $(DEFAULT_RELEASE) RELEASE ?= $(DEFAULT_RELEASE)
CODENAME := stretch CODENAME := buster
UNIT_VERSION = $(VERSION)-$(RELEASE)~$(CODENAME) 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 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_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.7=$${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.5=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION}"
MODULE_minimal="unit=$${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: default:
@echo "valid targets: all build dockerfiles push clean" @echo "valid targets: all build dockerfiles push clean"