Prepare Java for inclusion in openHABian image

Signed-off-by: Ethan Dye <[email protected]>
openhab · May 30, 2020 · 76f76d0 · 76f76d0
1 parent 11000b7
commit 76f76d0
Show file tree

Hide file tree

Showing 24 changed files with 289 additions and 289 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -134,8 +134,8 @@ jobs:
       script:
         # AdoptOpenJDK Java on 32bit ARMv7 on 32bit OS on Travis Arm64 HW
         - export HW=rpi2
-        - sed -i 's/^java_opt=.*/java_opt=AdoptOpenJDK/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Adopt11/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-arm32hf-native .
-        - echo -e "\n\e[36mopenHABian test installation 64bit AdoptOpenJDK Java \e[31m on 32bit OS\e[36m on virtual $HW ...\n"
+        - echo -e "\n\e[36mopenHABian test installation 64bit AdoptOpenJDK 11 Java \e[31m on 32bit OS\e[36m on virtual $HW ...\n"
         - docker run --memory="1g" --memory-reservation="1g" --name "openhabian-${HW}" -d openhabian/${HW}-openhabian;
         - docker exec -i "openhabian-${HW}" bash -c './build.bash local-test && mv ~/.profile ~/.bash_profile && /etc/rc.local'
diff --git a/Dockerfile.openhabian-ARMv6hf-native b/Dockerfile.openhabian-ARMv6hf-native
@@ -51,4 +51,3 @@ VOLUME ["/sys/fs/cgroup"]
 STOPSIGNAL 37
 
 CMD ["bash", "start.sh"]
-
diff --git a/Dockerfile.openhabian-aarch64-64bit b/Dockerfile.openhabian-aarch64-64bit
@@ -40,7 +40,7 @@ RUN cp docker-systemctl-replacement/files/docker/systemctl3.py /bin/systemctl
 ENTRYPOINT ["/usr/bin/entry.sh"]
 
 RUN adduser openhabian --gecos "Openhabian,,," --disabled-password
-RUN echo "openhabian:openhabian" | chpasswd   
+RUN echo "openhabian:openhabian" | chpasswd
 RUN /bin/echo -n "Running on " && /usr/bin/arch
 
 COPY . /opt/openhabian/

diff --git a/Dockerfile.openhabian-aarch64-native b/Dockerfile.openhabian-aarch64-native
@@ -40,7 +40,7 @@ RUN cp docker-systemctl-replacement/files/docker/systemctl3.py /bin/systemctl
 ENTRYPOINT ["/usr/bin/entry.sh"]
 
 RUN adduser openhabian --gecos "Openhabian,,," --disabled-password
-RUN echo "openhabian:openhabian" | chpasswd   
+RUN echo "openhabian:openhabian" | chpasswd
 RUN /bin/echo -n "Running on " && /usr/bin/arch
 
 COPY . /opt/openhabian/

diff --git a/Dockerfile.openhabian-arm32hf-CM3 b/Dockerfile.openhabian-arm32hf-CM3
@@ -39,7 +39,7 @@ RUN cp docker-systemctl-replacement/files/docker/systemctl3.py /bin/systemctl
 ENTRYPOINT ["/usr/bin/entry.sh"]
 
 RUN adduser openhabian --gecos "Openhabian,,," --disabled-password
-RUN echo "openhabian:openhabian" | chpasswd   
+RUN echo "openhabian:openhabian" | chpasswd
 RUN /bin/echo -n "Running on " && /usr/bin/arch
 
 COPY . /opt/openhabian/

diff --git a/Dockerfile.openhabian-arm32hf-emulated b/Dockerfile.openhabian-arm32hf-emulated
@@ -1,6 +1,6 @@
 # assumes at least ARMv71 but not ARMv8 (aarch64) yet
 FROM balenalib/raspberry-pi2-debian-node:latest-buster
- 
+
 RUN [ "cross-build-start" ]
 
 ENV container docker
@@ -39,7 +39,7 @@ RUN cp docker-systemctl-replacement/files/docker/systemctl3.py /bin/systemctl
 ENTRYPOINT ["/usr/bin/entry.sh"]
 
 RUN adduser openhabian --gecos "Openhabian,,," --disabled-password
-RUN echo "openhabian:openhabian" | chpasswd   
+RUN echo "openhabian:openhabian" | chpasswd
 RUN /bin/echo -n "Running on " && /usr/bin/arch
 
 COPY . /opt/openhabian/
@@ -54,4 +54,3 @@ STOPSIGNAL 37
 CMD ["bash", "start.sh"]
 
 RUN [ "cross-build-end" ]
-
diff --git a/Dockerfile.openhabian-x86 b/Dockerfile.openhabian-x86
@@ -37,7 +37,7 @@ RUN cp docker-systemctl-replacement/files/docker/systemctl3.py /bin/systemctl
 ENTRYPOINT ["/usr/bin/entry.sh"]
 
 RUN adduser openhabian --gecos "Openhabian,,," --disabled-password
-RUN echo "openhabian:openhabian" | chpasswd   
+RUN echo "openhabian:openhabian" | chpasswd
 RUN /bin/echo -n "Running on " && /usr/bin/arch
 
 COPY . /opt/openhabian/

diff --git a/NEWS.md b/NEWS.md
@@ -0,0 +1,8 @@
+### May 29, 2020
+New options for the JDK that runs openHAB are now available:
+
+ - Java Zulu 8 32-Bit OpenJDK (default on arm based platforms)
+ - Java Zulu 8 64-Bit OpenJDK (default on x86 based platforms)
+ - Java Zulu 11 32-Bit OpenJDK (beta testing for openHAB 3)
+ - Java Zulu 11 64-Bit OpenJDK (beta testing for openHAB 3)
+ - AdoptOpenJDK 11 OpenJDK (beta replacement for Zulu)
diff --git a/build-image/openhabian.conf b/build-image/openhabian.conf
@@ -52,7 +52,7 @@ mode=unattended
 #release=buster
 
 # Java architecture mode
-# Valid arguments: "AdoptOpenJDK", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
+# Valid arguments: "Adopt11", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
 java_opt=Zulu8-32
 
 # vim: filetype=sh
diff --git a/build-image/openhabian.pi-raspbian.conf b/build-image/openhabian.pi-raspbian.conf
@@ -52,7 +52,7 @@ mode=unattended
 #release=buster
 
 # Java architecture mode
-# Valid arguments: "AdoptOpenJDK", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
+# Valid arguments: "Adopt11", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
 java_opt=Zulu8-32
 
 # vim: filetype=sh
diff --git a/build-image/openhabian.pine64-xenial.conf b/build-image/openhabian.pine64-xenial.conf
@@ -26,5 +26,5 @@ wifi_country=""
 # vim: filetype=sh
 
 # Java architecture mode
-# Valid arguments: "AdoptOpenJDK", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
+# Valid arguments: "Adopt11", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
 java_opt=Zulu8-32
diff --git a/docs/openhabian.md b/docs/openhabian.md
@@ -159,7 +159,7 @@ In `openhabian.conf`, uncomment and complete the lines reading `hw=`, `hwarch=`
 
 {: #debug-mode}
 ### Debug mode
-See [Troubleshooting] section if you run into trouble installing. If you want to turn on debug mode, 
+See [Troubleshooting] section if you run into trouble installing. If you want to turn on debug mode,
 edit `openhabian.conf` and set the `debug=` parameter to either `none`, `on` or `maximum`.
 
 {: #ipv6-notes}

diff --git a/functions/config.bash b/functions/config.bash
@@ -31,7 +31,7 @@ clean_config_userpw() {
 }
 
 ## Update java architecture in config file
-## Valid arguments: "AdoptOpenJDK", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
+## Valid arguments: "Adopt11", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
 update_config_java() {
   if [ "$1" == "Zulu8-64" ] || [ "$1" == "Zulu11-64" ]; then
     if (! is_x86_64 && ! [ "$(getconf LONG_BIT)" == "64" ]) || (! is_aarch64 && ! [ "$(getconf LONG_BIT)" == "64" ]); then

diff --git a/functions/influxdb+grafana.bash b/functions/influxdb+grafana.bash
@@ -225,7 +225,8 @@ influxdb_grafana_setup() {
 influxdb_install() {
   local influxdb_address
   local influxdb_admin_username
-  local dist codename
+  local dist
+  local codename
 
   cond_echo ""
   echo "Installing InfluxDB..."
@@ -242,7 +243,7 @@ influxdb_install() {
   influxdb_admin_username="admin"
 #  if [ ! -f /etc/influxdb/influxdb.conf ]; then
     cond_redirect wget -O - https://repos.influxdata.com/influxdb.key | apt-key add - || FAILED=1
-    echo "deb https://repos.influxdata.com/$dist $codename stable" > /etc/apt/sources.list.d/influxdb.list || FAILED=1
+    echo "deb https://repos.influxdata.com/${dist} ${codename} stable" > /etc/apt/sources.list.d/influxdb.list || FAILED=1
     cond_redirect apt-get update || FAILED=1
     cond_redirect apt-get -y install influxdb || FAILED=1
 
@@ -301,7 +302,7 @@ grafana_install(){
   echo -n "Wait for Grafana to start... "
   curl --retry 5 --retry-connrefused -s http://localhost:3000 >/dev/null || FAILED=2
   if [ $FAILED -eq 2 ]; then echo -n "FAILED "; return 2; else echo -n "OK "; fi
-  sleep 10 
+  sleep 10
   cond_echo ""
 
   # password reset required if Grafana password was already set before (no first-time install)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,4 +51,3 @@ VOLUME ["/sys/fs/cgroup"]
		STOPSIGNAL 37

		CMD ["bash", "start.sh"]