OpenHAB
/
openhab-docker
mirror of https://github.com/openhab/openhab-docker.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade Zulu JDK and base images (#365) 

Updates:

* Zulu JDK to 11.0.12
* Alpine to 3.14.2
* Debian to 10.10

Signed-off-by: Wouter Born <github@maindrain.net>
pull/366/head
Wouter Born 2021-08-31 23:53:38 +02:00 committed by GitHub
parent 60421f3d00
commit ff9f3213e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -81,7 +81,7 @@ Comments, suggestions and contributions are welcome!
**Distributions:**
* `debian` for Debian 10 "buster" (default when not specified in tag) ([Dockerfile](https://github.com/openhab/openhab-docker/blob/main/debian/Dockerfile))
* `alpine` for Alpine 3.13 ([Dockerfile](https://github.com/openhab/openhab-docker/blob/main/alpine/Dockerfile))
* `alpine` for Alpine 3.14 ([Dockerfile](https://github.com/openhab/openhab-docker/blob/main/alpine/Dockerfile))
The Alpine images are substantially smaller than the Debian images but may be less compatible because OpenJDK is used (see [Prerequisites](https://www.openhab.org/docs/installation/#prerequisites) for known disadvantages).

2
alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.13.5
FROM alpine:3.14.2
ARG BUILD_DATE
ARG VCS_REF

8
debian/Dockerfile vendored
View File

@ -1,4 +1,4 @@
FROM debian:10.9-slim
FROM debian:10.10-slim
ARG BUILD_DATE
ARG VCS_REF
@ -66,9 +66,9 @@ RUN apt-get update && \
ENV JAVA_HOME='/usr/lib/jvm/default-jvm'
# Limit JDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
RUN mkdir -p "${JAVA_HOME}" && \
zulu11_amd64_url='https://cdn.azul.com/zulu/bin/zulu11.48.21-ca-jdk11.0.11-linux_x64.tar.gz' && \
zulu11_armhf_url='https://cdn.azul.com/zulu-embedded/bin/zulu11.48.21-ca-jdk11.0.11-linux_aarch32hf.tar.gz' && \
zulu11_arm64_url='https://cdn.azul.com/zulu-embedded/bin/zulu11.48.21-ca-jdk11.0.11-linux_aarch64.tar.gz' && \
zulu11_amd64_url='https://cdn.azul.com/zulu/bin/zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz' && \
zulu11_armhf_url='https://cdn.azul.com/zulu-embedded/bin/zulu11.50.19-ca-jdk11.0.12-linux_aarch32hf.tar.gz' && \
zulu11_arm64_url='https://cdn.azul.com/zulu-embedded/bin/zulu11.50.19-ca-jdk11.0.12-linux_aarch64.tar.gz' && \
url_var="zulu${JAVA_VERSION}_$(dpkg --print-architecture)_url" && \
eval "java_url=\$$url_var" && \
wget -nv -O /tmp/java.tar.gz "${java_url}" && \