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

Docker: bumped versions.

Browse Source 
Minimal image now uses Debian 11 "Bullseye" as a base.

Language versions are bumped to:
- Go 1.17
- Node 16
- Perl 5.34
- Ruby 3.0
This commit is contained in:
Konstantin Pavlov
2021-09-21 14:03:23 +03:00
parent c07f3d3ff6
commit d51b3bbfeb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/docker/Makefile
View File

@@ -12,13 +12,13 @@ EXPORT_DIR := $(VERSION)
MODULES ?= go jsc node perl php python ruby minimal MODULES ?= go jsc node perl php python ruby minimal
VERSION_minimal ?= VERSION_minimal ?=
CONTAINER_minimal ?= debian:buster-slim CONTAINER_minimal ?= debian:bullseye-slim
CONFIGURE_minimal ?= CONFIGURE_minimal ?=
INSTALL_minimal ?= version INSTALL_minimal ?= version
define COPY_minimal define COPY_minimal
endef endef
VERSION_go ?= 1.15 VERSION_go ?= 1.17
CONTAINER_go ?= golang:$(VERSION_go) CONTAINER_go ?= golang:$(VERSION_go)
CONFIGURE_go ?= go --go-path=$$GOPATH CONFIGURE_go ?= go --go-path=$$GOPATH
INSTALL_go ?= go-install-src libunit-install INSTALL_go ?= go-install-src libunit-install
@@ -34,7 +34,7 @@ CONFIGURE_jsc ?= java --jars=/usr/share/unit-jsc-common/
INSTALL_jsc ?= java-shared-install java-install INSTALL_jsc ?= java-shared-install java-install
COPY_jsc = COPY --from=BUILDER /usr/share/unit-jsc-common/ /usr/share/unit-jsc-common/ COPY_jsc = COPY --from=BUILDER /usr/share/unit-jsc-common/ /usr/share/unit-jsc-common/
VERSION_node ?= 15 VERSION_node ?= 16
CONTAINER_node ?= node:$(VERSION_node) CONTAINER_node ?= node:$(VERSION_node)
CONFIGURE_node ?= nodejs --node-gyp=/usr/local/lib/node_modules/npm/bin/node-gyp-bin/node-gyp CONFIGURE_node ?= nodejs --node-gyp=/usr/local/lib/node_modules/npm/bin/node-gyp-bin/node-gyp
INSTALL_node ?= node node-install libunit-install INSTALL_node ?= node node-install libunit-install
@@ -44,7 +44,7 @@ COPY --from=BUILDER /usr/include/nxt_* /usr/include/\n\$
COPY --from=BUILDER /usr/local/lib/node_modules/unit-http/ /usr/local/lib/node_modules/unit-http/ COPY --from=BUILDER /usr/local/lib/node_modules/unit-http/ /usr/local/lib/node_modules/unit-http/
endef endef
VERSION_perl ?= 5.32 VERSION_perl ?= 5.34
CONTAINER_perl ?= perl:$(VERSION_perl) CONTAINER_perl ?= perl:$(VERSION_perl)
CONFIGURE_perl ?= perl CONFIGURE_perl ?= perl
INSTALL_perl ?= perl-install INSTALL_perl ?= perl-install
@@ -62,7 +62,7 @@ CONFIGURE_python ?= python --config=/usr/local/bin/python3-config
INSTALL_python ?= python3-install INSTALL_python ?= python3-install
COPY_python = COPY_python =
VERSION_ruby ?= 2.7 VERSION_ruby ?= 3.0
CONTAINER_ruby ?= ruby:$(VERSION_ruby) CONTAINER_ruby ?= ruby:$(VERSION_ruby)
CONFIGURE_ruby ?= ruby CONFIGURE_ruby ?= ruby
INSTALL_ruby ?= ruby-install INSTALL_ruby ?= ruby-install