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

Docker: bumped language versions, moved jsc11 to eclipse-temurin.

Browse Source 
openjdk builds are no longer provided in the docker library due to deprecation.
This commit is contained in:
Konstantin Pavlov
2022-09-09 16:17:42 +04:00
parent 97124fc349
commit 38350c17fc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/docker/Makefile
View File

@@ -18,7 +18,7 @@ INSTALL_minimal ?= version
define COPY_minimal define COPY_minimal
endef endef
VERSION_go ?= 1.18 VERSION_go ?= 1.19
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
@@ -29,7 +29,7 @@ COPY --from=BUILDER /go/src/ /go/src/
endef endef
VERSION_jsc ?= 11 VERSION_jsc ?= 11
CONTAINER_jsc ?= openjdk:$(VERSION_jsc)-jdk CONTAINER_jsc ?= eclipse-temurin:$(VERSION_jsc)-jdk
CONFIGURE_jsc ?= java --jars=/usr/share/unit-jsc-common/ 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/
@@ -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.34 VERSION_perl ?= 5.36
CONTAINER_perl ?= perl:$(VERSION_perl) CONTAINER_perl ?= perl:$(VERSION_perl)
CONFIGURE_perl ?= perl CONFIGURE_perl ?= perl
INSTALL_perl ?= perl-install INSTALL_perl ?= perl-install