Add 2.5.10 (#324)

Signed-off-by: Wouter Born <github@maindrain.net>
pull/326/head
Wouter Born 2020-12-13 18:36:51 +01:00 committed by GitHub
parent 7e543ee172
commit bc87464223
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 38 additions and 32 deletions

View File

@ -11,7 +11,7 @@ FROM alpine:3.12.2
# Set version variables
ENV \
JAVA_VERSION="8" \
OPENHAB_VERSION="2.5.8"
OPENHAB_VERSION="2.5.11"
# 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.8%2Fopenhab-2.5.8.zip" && \
RUN wget -nv -O /tmp/openhab.zip "https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F2.5.11%2Fopenhab-2.5.11.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.7-slim
# Set version variables
ENV \
JAVA_VERSION="8" \
OPENHAB_VERSION="2.5.8"
OPENHAB_VERSION="2.5.11"
# 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.8%2Fopenhab-2.5.8.zip" && \
RUN wget -nv -O /tmp/openhab.zip "https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F2.5.11%2Fopenhab-2.5.11.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.2
# Set version variables
ENV \
JAVA_VERSION="8" \
OPENHAB_VERSION="2.5.11-snapshot"
OPENHAB_VERSION="2.5.12-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.11-SNAPSHOT.zip" && \
RUN wget -nv -O /tmp/openhab.zip "https://ci.openhab.org/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab/target/openhab-2.5.12-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.7-slim
# Set version variables
ENV \
JAVA_VERSION="8" \
OPENHAB_VERSION="2.5.11-snapshot"
OPENHAB_VERSION="2.5.12-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.11-SNAPSHOT.zip" && \
RUN wget -nv -O /tmp/openhab.zip "https://ci.openhab.org/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab/target/openhab-2.5.12-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,9 +2,18 @@
![openHAB logo](https://github.com/openhab/openhab-docker/raw/master/images/openhab.png)
[![Build Status](https://ci.openhab.org/job/openHAB-Docker/badge/icon)](https://ci.openhab.org/job/openHAB-Docker/) [![](https://images.microbadger.com/badges/image/openhab/openhab:2.5.10.svg)](https://microbadger.com/images/openhab/openhab:2.5.10 "Get your own image badge on microbadger.com") [![Docker Label](https://images.microbadger.com/badges/version/openhab/openhab:2.5.10.svg)](https://microbadger.com/#/images/openhab/openhab:2.5.10) [![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)
[![Build Status](https://ci.openhab.org/job/openHAB-Docker/badge/icon)](https://ci.openhab.org/job/openHAB-Docker/)
[![EPL-2.0](https://img.shields.io/badge/license-EPL%202-green.svg)](https://opensource.org/licenses/EPL-2.0)
[![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=31868624)](https://www.bountysource.com/teams/openhab/issues?tracker_ids=31868624)
[![Docker Version](https://images.microbadger.com/badges/version/openhab/openhab:2.5.11.svg)](https://microbadger.com/#/images/openhab/openhab:2.5.11)
[![Docker Metadata](https://images.microbadger.com/badges/image/openhab/openhab:2.5.11.svg)](https://microbadger.com/images/openhab/openhab:2.5.11)
[![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/)
[![GitHub Issues](https://img.shields.io/github/issues/openhab/openhab-docker.svg)](https://github.com/openhab/openhab-docker/issues)
[![GitHub Stars](https://img.shields.io/github/stars/openhab/openhab-docker.svg)](https://github.com/openhab/openhab-docker/stargazers)
[![GitHub Forks](https://img.shields.io/github/forks/openhab/openhab-docker.svg)](https://github.com/openhab/openhab-docker/network)
[![CodeFactor](https://www.codefactor.io/repository/github/openhab/openhab-docker/badge)](https://www.codefactor.io/repository/github/openhab/openhab-docker)
[![Gitter Chat](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)
# Table of Contents
@ -65,11 +74,11 @@ Comments, suggestions and contributions are welcome!
* `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.10` Stable openHAB 2.5.x version ([Dockerfile](https://github.com/openhab/openhab-docker/blob/master/2.5.10/debian/Dockerfile))
* `2.5.0` - `2.5.11` Stable openHAB 2.5.x version ([Dockerfile](https://github.com/openhab/openhab-docker/blob/master/2.5.11/debian/Dockerfile))
* `3.0.0.M3` Experimental openHAB 3.0.0.M3 Milestone version ([Dockerfile](https://github.com/openhab/openhab-docker/blob/master/3.0.0.M3/debian/Dockerfile))
* `3.0.0.M4` Experimental openHAB 3.0.0.M4 Milestone version ([Dockerfile](https://github.com/openhab/openhab-docker/blob/master/3.0.0.M4/debian/Dockerfile))
* `3.0.0.M5` Experimental openHAB 3.0.0.M5 Milestone version ([Dockerfile](https://github.com/openhab/openhab-docker/blob/master/3.0.0.M5/debian/Dockerfile))
* `2.5.11-snapshot` Experimental openHAB 2.5.11 SNAPSHOT version ([Dockerfile](https://github.com/openhab/openhab-docker/blob/master/2.5.11-snapshot/debian/Dockerfile))
* `2.5.12-snapshot` Experimental openHAB 2.5.12 SNAPSHOT version ([Dockerfile](https://github.com/openhab/openhab-docker/blob/master/2.5.12-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:**
@ -79,7 +88,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.10`.
If you are unsure about what your needs are, you probably want to use `openhab/openhab:2.5.11`.
Prebuilt Docker Images can be found here: [Docker Images](https://hub.docker.com/r/openhab/openhab)
@ -101,7 +110,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.10`
`docker run --name openhab --net=host openhab/openhab:2.5.11`
_**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._
@ -128,7 +137,7 @@ docker run \
-e "EXTRA_JAVA_OPTS=-Duser.timezone=Europe/Berlin" \
-d \
--restart=always \
openhab/openhab:2.5.10
openhab/openhab:2.5.11
```
#### Running from compose-file.yml
@ -140,7 +149,7 @@ version: '2.2'
services:
openhab:
image: "openhab/openhab:2.5.10"
image: "openhab/openhab:2.5.11"
restart: always
network_mode: host
volumes:
@ -162,7 +171,7 @@ version: '2.2'
services:
openhab:
image: "openhab/openhab:2.5.10"
image: "openhab/openhab:2.5.11"
restart: always
network_mode: host
volumes:
@ -198,7 +207,7 @@ version: '2.2'
services:
openhab:
container_name: openhab
image: "openhab/openhab:2.5.10"
image: "openhab/openhab:2.5.11"
restart: always
network_mode: host
cap_add:
@ -227,7 +236,7 @@ version: '2.2'
services:
openhab:
image: "openhab/openhab:2.5.10"
image: "openhab/openhab:2.5.11"
restart: always
ports:
- "8080:8080"
@ -258,7 +267,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.10
openhab/openhab:2.5.11
```
### Automating Docker setup using Ansible (for advanced user)
@ -274,7 +283,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.10
image: openhab/openhab:2.5.11
state: started
detach: yes
interactive: yes
@ -316,7 +325,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.10`
`docker run --detach --name openhab openhab/openhab:2.5.11`
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:
@ -331,13 +340,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.10`
`docker run -it openhab/openhab:2.5.11`
#### Debug mode
The debug mode is started with the command:
`docker run -it openhab/openhab:2.5.10 ./start_debug.sh`
`docker run -it openhab/openhab:2.5.11 ./start_debug.sh`
## Environment variables
@ -444,7 +453,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.10/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.11/debian`) and then run these commands to build and run a Docker image for your current architecture:
```shell
$ docker build --tag openhab/openhab .
@ -463,7 +472,7 @@ $ sudo systemctl restart docker
$ docker buildx create --name builder --use
```
Change to a directory containing a Dockerfile (e.g. `2.5.10/debian`) and then use the following command to build a armhf image:
Change to a directory containing a Dockerfile (e.g. `2.5.11/debian`) and then use the following command to build a armhf image:
```
$ docker buildx build --platform linux/arm/v7 --tag openhab/openhab --load .
@ -603,7 +612,3 @@ For more information on this see the [Docker documentation](https://docs.docker.
## Contributing
[Contribution guidelines](https://github.com/openhab/openhab-docker/blob/master/CONTRIBUTING.md)
## License
When not explicitly set, files are placed under [![EPL-2.0 license](https://img.shields.io/badge/license-EPL--2.0-blue.svg)](https://raw.githubusercontent.com/openhab/openhab-docker/master/LICENSE)

View File

@ -28,7 +28,8 @@
2.5.8
2.5.9
2.5.10
2.5.11-snapshot
2.5.11
2.5.12-snapshot
3.0.0.M1
3.0.0.M2
3.0.0.M3