Add 2.5.8 (#304)

Signed-off-by: Wouter Born <github@maindrain.net>
pull/307/head
Wouter Born 2020-08-23 17:14:54 +02:00 committed by GitHub
parent dc8a3a89c5
commit f16a4ea590
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 31 additions and 30 deletions

View File

@ -53,13 +53,13 @@ env:
- VERSION=2.3.0 DIST=debian
- VERSION=2.4.0 DIST=alpine
- VERSION=2.4.0 DIST=debian
- VERSION=2.5.5 DIST=alpine
- VERSION=2.5.5 DIST=debian
- VERSION=2.5.6 DIST=alpine
- VERSION=2.5.6 DIST=debian
- VERSION=2.5.7 DIST=alpine
- VERSION=2.5.7 DIST=debian
- VERSION=2.5.8-snapshot DIST=alpine
- VERSION=2.5.8-snapshot DIST=debian
- VERSION=2.5.8 DIST=alpine
- VERSION=2.5.8 DIST=debian
- VERSION=2.5.9-snapshot DIST=alpine
- VERSION=2.5.9-snapshot DIST=debian
- VERSION=3.0.0-snapshot DIST=alpine
- VERSION=3.0.0-snapshot DIST=debian

View File

@ -11,7 +11,7 @@ FROM alpine:3.12.0
# Set version variables
ENV \
JAVA_VERSION="8" \
OPENHAB_VERSION="2.5.5"
OPENHAB_VERSION="2.5.8"
# Set other variables
ENV \
@ -81,7 +81,7 @@ RUN if [ "${JAVA_VERSION}" = "8" ]; then \
# Install openHAB
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
RUN wget -nv -O /tmp/openhab.zip "https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F2.5.5%2Fopenhab-2.5.5.zip" && \
RUN wget -nv -O /tmp/openhab.zip "https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F2.5.8%2Fopenhab-2.5.8.zip" && \
unzip -q /tmp/openhab.zip -d "${OPENHAB_HOME}" -x "*.bat" "*.ps1" "*.psm1" && \
rm /tmp/openhab.zip && \
if [ ! -f "${OPENHAB_HOME}/runtime/bin/update.lst" ]; then touch "${OPENHAB_HOME}/runtime/bin/update.lst"; fi && \

View File

@ -11,7 +11,7 @@ FROM debian:10.4-slim
# Set version variables
ENV \
JAVA_VERSION="8" \
OPENHAB_VERSION="2.5.5"
OPENHAB_VERSION="2.5.8"
# Set other variables
ENV \
@ -97,7 +97,7 @@ RUN mkdir -p "${JAVA_HOME}" && \
# Install openHAB
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
RUN wget -nv -O /tmp/openhab.zip "https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F2.5.5%2Fopenhab-2.5.5.zip" && \
RUN wget -nv -O /tmp/openhab.zip "https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F2.5.8%2Fopenhab-2.5.8.zip" && \
unzip -q /tmp/openhab.zip -d "${OPENHAB_HOME}" -x "*.bat" "*.ps1" "*.psm1" && \
rm /tmp/openhab.zip && \
if [ ! -f "${OPENHAB_HOME}/runtime/bin/update.lst" ]; then touch "${OPENHAB_HOME}/runtime/bin/update.lst"; fi && \

View File

@ -11,7 +11,7 @@ FROM alpine:3.12.0
# Set version variables
ENV \
JAVA_VERSION="8" \
OPENHAB_VERSION="2.5.8-snapshot"
OPENHAB_VERSION="2.5.9-snapshot"
# Set other variables
ENV \
@ -81,7 +81,7 @@ RUN if [ "${JAVA_VERSION}" = "8" ]; then \
# Install openHAB
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
RUN wget -nv -O /tmp/openhab.zip "https://ci.openhab.org/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab/target/openhab-2.5.8-SNAPSHOT.zip" && \
RUN wget -nv -O /tmp/openhab.zip "https://ci.openhab.org/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab/target/openhab-2.5.9-SNAPSHOT.zip" && \
unzip -q /tmp/openhab.zip -d "${OPENHAB_HOME}" -x "*.bat" "*.ps1" "*.psm1" && \
rm /tmp/openhab.zip && \
if [ ! -f "${OPENHAB_HOME}/runtime/bin/update.lst" ]; then touch "${OPENHAB_HOME}/runtime/bin/update.lst"; fi && \

View File

@ -11,7 +11,7 @@ FROM debian:10.4-slim
# Set version variables
ENV \
JAVA_VERSION="8" \
OPENHAB_VERSION="2.5.8-snapshot"
OPENHAB_VERSION="2.5.9-snapshot"
# Set other variables
ENV \
@ -97,7 +97,7 @@ RUN mkdir -p "${JAVA_HOME}" && \
# Install openHAB
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
RUN wget -nv -O /tmp/openhab.zip "https://ci.openhab.org/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab/target/openhab-2.5.8-SNAPSHOT.zip" && \
RUN wget -nv -O /tmp/openhab.zip "https://ci.openhab.org/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab/target/openhab-2.5.9-SNAPSHOT.zip" && \
unzip -q /tmp/openhab.zip -d "${OPENHAB_HOME}" -x "*.bat" "*.ps1" "*.psm1" && \
rm /tmp/openhab.zip && \
if [ ! -f "${OPENHAB_HOME}/runtime/bin/update.lst" ]; then touch "${OPENHAB_HOME}/runtime/bin/update.lst"; fi && \

View File

@ -2,7 +2,7 @@
![openHAB logo](https://github.com/openhab/openhab-docker/raw/master/images/openhab.png)
[![Build state](https://travis-ci.com/openhab/openhab-docker.svg?branch=master)](https://travis-ci.com/openhab/openhab-docker) [![](https://images.microbadger.com/badges/image/openhab/openhab:2.5.7.svg)](https://microbadger.com/images/openhab/openhab:2.5.7 "Get your own image badge on microbadger.com") [![Docker Label](https://images.microbadger.com/badges/version/openhab/openhab:2.5.7.svg)](https://microbadger.com/#/images/openhab/openhab:2.5.7) [![Docker Stars](https://img.shields.io/docker/stars/openhab/openhab.svg?maxAge=2592000)](https://hub.docker.com/r/openhab/openhab/) [![Docker Pulls](https://img.shields.io/docker/pulls/openhab/openhab.svg?maxAge=2592000)](https://hub.docker.com/r/openhab/openhab/) [![Join the chat at https://gitter.im/openhab/openhab-docker](https://badges.gitter.im/openhab/openhab-docker.svg)](https://gitter.im/openhab/openhab-docker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Build state](https://travis-ci.com/openhab/openhab-docker.svg?branch=master)](https://travis-ci.com/openhab/openhab-docker) [![](https://images.microbadger.com/badges/image/openhab/openhab:2.5.8.svg)](https://microbadger.com/images/openhab/openhab:2.5.8 "Get your own image badge on microbadger.com") [![Docker Label](https://images.microbadger.com/badges/version/openhab/openhab:2.5.8.svg)](https://microbadger.com/#/images/openhab/openhab:2.5.8) [![Docker Stars](https://img.shields.io/docker/stars/openhab/openhab.svg?maxAge=2592000)](https://hub.docker.com/r/openhab/openhab/) [![Docker Pulls](https://img.shields.io/docker/pulls/openhab/openhab.svg?maxAge=2592000)](https://hub.docker.com/r/openhab/openhab/) [![Join the chat at https://gitter.im/openhab/openhab-docker](https://badges.gitter.im/openhab/openhab-docker.svg)](https://gitter.im/openhab/openhab-docker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![GitHub issues](https://img.shields.io/github/issues/openhab/openhab-docker.svg)](https://github.com/openhab/openhab-docker/issues) [![GitHub forks](https://img.shields.io/github/forks/openhab/openhab-docker.svg)](https://github.com/openhab/openhab-docker/network) [![GitHub stars](https://img.shields.io/github/stars/openhab/openhab-docker.svg)](https://github.com/openhab/openhab-docker/stargazers) [![CodeFactor](https://www.codefactor.io/repository/github/openhab/openhab-docker/badge)](https://www.codefactor.io/repository/github/openhab/openhab-docker) [![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=31868624)](https://www.bountysource.com/teams/openhab/issues?tracker_ids=31868624)
@ -69,8 +69,8 @@ Comments, suggestions and contributions are welcome!
* `2.2.0` Stable openHAB 2.2.0 version
* `2.3.0` Stable openHAB 2.3.0 version ([Dockerfile](https://github.com/openhab/openhab-docker/blob/master/2.3.0/debian/Dockerfile))
* `2.4.0` Stable openHAB 2.4.0 version ([Dockerfile](https://github.com/openhab/openhab-docker/blob/master/2.4.0/debian/Dockerfile))
* `2.5.0` - `2.5.7` Stable openHAB 2.5.x version ([Dockerfile](https://github.com/openhab/openhab-docker/blob/master/2.5.7/debian/Dockerfile))
* `2.5.8-snapshot` Experimental openHAB 2.5.8 SNAPSHOT version ([Dockerfile](https://github.com/openhab/openhab-docker/blob/master/2.5.8-snapshot/debian/Dockerfile))
* `2.5.0` - `2.5.8` Stable openHAB 2.5.x version ([Dockerfile](https://github.com/openhab/openhab-docker/blob/master/2.5.8/debian/Dockerfile))
* `2.5.9-snapshot` Experimental openHAB 2.5.9 SNAPSHOT version ([Dockerfile](https://github.com/openhab/openhab-docker/blob/master/2.5.9-snapshot/debian/Dockerfile))
* `3.0.0-snapshot` Experimental openHAB 3.0.0 SNAPSHOT version ([Dockerfile](https://github.com/openhab/openhab-docker/blob/master/3.0.0-snapshot/debian/Dockerfile))
**Distributions:**
@ -80,7 +80,7 @@ Comments, suggestions and contributions are welcome!
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).
If you are unsure about what your needs are, you probably want to use `openhab/openhab:2.5.7`.
If you are unsure about what your needs are, you probably want to use `openhab/openhab:2.5.8`.
Prebuilt Docker Images can be found here: [Docker Images](https://hub.docker.com/r/openhab/openhab)
@ -102,7 +102,7 @@ There is no armhf Alpine image for openHAB 3 because the openjdk11 package is un
The following will run openHAB in demo mode on the host machine:
`docker run --name openhab --net=host openhab/openhab:2.5.7`
`docker run --name openhab --net=host openhab/openhab:2.5.8`
_**NOTE:** Although this is the simplest method to getting openHAB up and running, but it is not the preferred method.
To properly run the container, please specify a **host volume** for the directories._
@ -129,7 +129,7 @@ docker run \
-e "EXTRA_JAVA_OPTS=-Duser.timezone=Europe/Berlin" \
-d \
--restart=always \
openhab/openhab:2.5.7
openhab/openhab:2.5.8
```
#### Running from compose-file.yml
@ -141,7 +141,7 @@ version: '2.2'
services:
openhab:
image: "openhab/openhab:2.5.7"
image: "openhab/openhab:2.5.8"
restart: always
network_mode: host
volumes:
@ -163,7 +163,7 @@ version: '2.2'
services:
openhab:
image: "openhab/openhab:2.5.7"
image: "openhab/openhab:2.5.8"
restart: always
network_mode: host
volumes:
@ -199,7 +199,7 @@ version: '2.2'
services:
openhab:
container_name: openhab
image: "openhab/openhab:2.5.7"
image: "openhab/openhab:2.5.8"
restart: always
network_mode: host
cap_add:
@ -228,7 +228,7 @@ version: '2.2'
services:
openhab:
image: "openhab/openhab:2.5.7"
image: "openhab/openhab:2.5.8"
restart: always
ports:
- "8080:8080"
@ -259,7 +259,7 @@ docker run \
-v /opt/openhab/conf:/openhab/conf \
-v /opt/openhab/userdata:/openhab/userdata \
-e "EXTRA_JAVA_OPTS=-Duser.timezone=Europe/Berlin" \
openhab/openhab:2.5.7
openhab/openhab:2.5.8
```
### Automating Docker setup using Ansible (for advanced user)
@ -275,7 +275,7 @@ Here is an example playbook in case you control your environment with Ansible. Y
tags: openhab
docker_container:
name: openhab
image: openhab/openhab:2.5.7
image: openhab/openhab:2.5.8
state: started
detach: yes
interactive: yes
@ -317,7 +317,7 @@ The default password for the login is `habopen`.
The container starts openHAB in server mode when no TTY is provided, example:
`docker run --detach --name openhab openhab/openhab:2.5.7`
`docker run --detach --name openhab openhab/openhab:2.5.8`
When the container runs in server mode you can also add a console logger so it prints logging to stdout so you can check the logging of a container named "openhab" with:
@ -332,13 +332,13 @@ To add the console logger, edit `userdata/etc/org.ops4j.pax.logging.cfg` and the
When a TTY is provided openHAB is started with an interactive console, e.g.:
`docker run -it openhab/openhab:2.5.7`
`docker run -it openhab/openhab:2.5.8`
#### Debug mode
The debug mode is started with the command:
`docker run -it openhab/openhab:2.5.7 ./start_debug.sh`
`docker run -it openhab/openhab:2.5.8 ./start_debug.sh`
## Environment variables
@ -445,7 +445,7 @@ All messages shown during the update are also logged to `userdata/logs/update.lo
## Building the images
Checkout the GitHub repository, change to a directory containing a Dockerfile (e.g. `2.5.7/debian`) and then run these commands to build and run a Docker image for your current architecture:
Checkout the GitHub repository, change to a directory containing a Dockerfile (e.g. `2.5.8/debian`) and then run these commands to build and run a Docker image for your current architecture:
```shell
$ docker build --tag openhab/openhab .
@ -464,7 +464,7 @@ $ sudo systemctl restart docker
$ docker buildx create --name builder --use
```
Change to a directory containing a Dockerfile (e.g. `2.5.7/debian`) and then use the following command to build a armhf image:
Change to a directory containing a Dockerfile (e.g. `2.5.8/debian`) and then use the following command to build a armhf image:
```
$ docker buildx build --platform linux/arm/v7 --tag openhab/openhab --load .

View File

@ -25,5 +25,6 @@
2.5.5
2.5.6
2.5.7
2.5.8-snapshot
2.5.8
2.5.9-snapshot
3.0.0-snapshot