diff options
| author | Konstantin Pavlov <thresh@nginx.com> | 2022-09-09 16:17:42 +0400 |
|---|---|---|
| committer | Konstantin Pavlov <thresh@nginx.com> | 2022-09-09 16:17:42 +0400 |
| commit | 38350c17fcfa0392c995688fd87bbd34d1ba374f (patch) | |
| tree | a677d2876bf73a2e5373dc5bc38ec14432e08e4e /pkg/docker | |
| parent | 97124fc349a0deae49ef547f65636b8bb1333ecd (diff) | |
| download | unit-38350c17fcfa0392c995688fd87bbd34d1ba374f.tar.gz unit-38350c17fcfa0392c995688fd87bbd34d1ba374f.tar.bz2 | |
Docker: bumped language versions, moved jsc11 to eclipse-temurin.
openjdk builds are no longer provided in the docker library due to deprecation.
Diffstat (limited to 'pkg/docker')
| -rw-r--r-- | pkg/docker/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 5c48f925..03723d1d 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -18,7 +18,7 @@ INSTALL_minimal ?= version define COPY_minimal endef -VERSION_go ?= 1.18 +VERSION_go ?= 1.19 CONTAINER_go ?= golang:$(VERSION_go) CONFIGURE_go ?= go --go-path=$$GOPATH INSTALL_go ?= go-install-src libunit-install @@ -29,7 +29,7 @@ COPY --from=BUILDER /go/src/ /go/src/ endef 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/ INSTALL_jsc ?= java-shared-install java-install 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/ endef -VERSION_perl ?= 5.34 +VERSION_perl ?= 5.36 CONTAINER_perl ?= perl:$(VERSION_perl) CONFIGURE_perl ?= perl INSTALL_perl ?= perl-install |