Commit Graph

239 Commits (4d9c336734c9a379d8560e0ee0b497f265784808)

Author SHA1 Message Date
Christian Häussler fdb251da3b
Curl (#147)
* Add curl package for alpine

Signed-off-by: Christian Häussler <c-n-i@web.de>
2017-12-28 23:00:38 +01:00
Chill3x 5bdb843a1b changed config option 'net' to 'network_mode' (#145)
* changed config option 'net' to 'network_mode'
2017-12-28 21:25:02 +01:00
Wouter Born 75ef3afb33 Exit container with error message when pseudo-TTY is unallocated (#141)
Fixes #139
Fixes #140

Signed-off-by: Wouter Born <eclipse@maindrain.net>
2017-12-22 01:19:34 +01:00
Christian Häussler 4efbb04e48
Unchain groupadd and adduser (#142)
* Add workaround for moby/moby#6345
https://github.com/moby/moby/issues/6345
Fix #126 and # fix #127

Signed-off-by: Christian Häussler <c-n-i@web.de>
2017-12-21 22:25:46 +01:00
Christian Häussler f9d5c101a2
Add JCE Policy (#138)
* Add JCE Policies
Fix #118

Signed-off-by: Christian Häussler <c-n-i@web.de>
2017-12-20 23:23:04 +01:00
Christian Häussler be3e88cfaf
Add docker attach (#137)
* Add docker attach
Fix #133

Signed-off-by: Christian Häussler <c-n-i@web.de>
2017-12-20 23:12:24 +01:00
Christian Häussler cd2daf29a0
Supplement readme (#135)
* Switch to back to alpine v3.6
Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)

Signed-off-by: Christian Häussler <c-n-i@web.de>

* Switch back to alpine v3.6
Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)

Signed-off-by: Christian Häussler <c-n-i@web.de>

* Merge pull request #1 from openhab/master

Update from master

* Merge remote-tracking branch 'refs/remotes/openhab/master'

* Add warning for Alpine image users
Fix #130

Signed-off-by: Christian Häussler <c-n-i@web.de>
2017-12-20 22:02:56 +01:00
Christian Häussler 8268e9594c
Alpine 3.7 (#134)
* Switch to alpine v3.7

Signed-off-by: Christian Häussler <c-n-i@web.de>
2017-12-20 20:36:26 +01:00
Christian Häussler b14e01e204 Revert "Switch to alpine v3.7"
This reverts commit 0f97538e27fe14d5b8850f9fabb0da01da447e44.
2017-12-19 21:12:39 +01:00
Christian Häussler d651af1a64
Switch back to alpine v3.6 (#131)
* Switch to back to alpine v3.6
Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)
Fix #132
2017-12-19 15:36:21 +01:00
Simon Merschjohann a549156145 2.2.0 release and 2.3.0-snapshot (#129)
* 2.2.0 release and 2.3.0-snapshot

Signed-off-by: Simon Merschjohann <smerschjo@gmail.com>
2017-12-18 23:14:13 +01:00
Christian Häussler 980563b5c9 Change Alpine updating procedure
Signed-off-by: Christian Häussler <c-n-i@web.de>
2017-12-11 00:34:23 +01:00
Christian Häussler 04d0b13216 Change Alpine updating procedure 2017-12-11 00:17:52 +01:00
Christian Häussler 054c735fe7 Change Alpine updating procedure
Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)
2017-12-10 23:14:13 +01:00
Christian Häussler 62563231ba Change Alpine updating procedure
Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)
2017-12-10 23:04:27 +01:00
Christian Häussler 44d6f52368
Change openHAB2 naming to openHAB (#124)
Signed-off-by: Christian Häussler <c-n-i@web.de>
2017-11-17 14:12:07 +01:00
Christian Häussler 52614a480c
Install ttf-dejavu for some basic fonts (needed for charts) (#123)
Signed-off-by: Christian Häussler <c-n-i@web.de>
2017-11-16 21:45:34 +01:00
Michael R Carroll d8331115d5 Fixes zip on debian (#111) & vendor typo (#117) (#119)
* Fixes zip (#111) & vendor typo (#117)

* Debian package list now include zip with && for following commands
* Minor typo in label vendor (penHAB -> openHAB)

Signed-off-by: Michael Carroll <me@michaelrcarroll.com> (github: michaelrcarroll)
2017-11-01 20:28:02 +01:00
Florian 958ef6b6b0 Add zip package for backup of OH2.2.0 config (#117)
* Add zip package for backup of OH2.2.0 config

Fixes #111

* Change tab to whitespaces
2017-10-30 20:34:56 +01:00
Christian Häussler 1fec160305 Add label metadata, fix entrypoint_alpine.sh for version 1.8.3 (#115) and fix codacy issue SC2155
* Add label metadata
Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)

* Fix entrypoint_alpine.sh for version 1.8.3
Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)

* Fix label-schema.description
Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)

* Fix codacy issue SC2155
Declare and assign separately to avoid masking return values.
See: https://github.com/koalaman/shellcheck/wiki/SC2155
Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)
2017-10-26 17:25:35 +02:00
Florian 1a2c341d50 Delete different instance.properties path, too (#114)
* Delete different instance.properties path, too

In my OH2 installation, the instance.properties file is located in
the tmp directory, and not in the runtime directory, that's why the
deletion of the file does not succeed, and restarting the container
does not work.
2017-10-25 21:26:40 +02:00
Florian 919e87182e Install ttf-dejavu for some basic fonts (needed for charts) (#113)
* Install ttf-dejavu for some basic fonts (needed for charts)

I've used the alpine image instead of the debian and all charts did
not work anymore. After finding:
https://github.com/docker-library/openjdk/issues/73
and installing the ttf.dejavu package manually, the charts worked again.

This commit adds this package to the alpine base packages which needs to
be installed to get a working OH2 environment.
2017-10-24 00:02:41 +02:00
Pascal Gollor 3ade9e0e1d fix bug https://github.com/openhab/openhab-docker/issues/108 only for… (#112)
* fix bug https://github.com/openhab/openhab-docker/issues/108 only for version 2.x
2017-10-23 23:46:43 +02:00
Christian Häussler ba3d7e0033 Remove known alpine issue
Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)
2017-10-22 23:05:35 +02:00
Christian Häussler 0295f380f8 Change new openhab logo
Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)
2017-10-22 23:02:34 +02:00
Pascal Gollor b86c78dd94 patch karaf PID conflict (#109)
* patch karaf PID conflict https://github.com/openhab/openhab-docker/issues/108
2017-10-22 20:29:59 +02:00
Christian Häussler 3a28795dec Docker image based on Alpine Linux (#107)
* Update README to Version 2.1.0

* Add Version 2.1.0 and 2.2.0-snapshot

* Update entrypoint.sh (#94) (#1)

* Echo actual `NEW_USER_ID`, instead of hardcoded/default id=9001.

* Remove Version 2.2.0-snapshot and add 2.1.0-snapshot

* Fix sudo enabled environment for travis

* RUN chmod +x on entrypoint.sh within Dockerfile to fix permission issue

* Add version 2.2.0-snapshot

* Add MAINTAINER section

* Docker image based on Alpine Linux #99

* Add alpine as base image and new architecture

* Add alpine as base image in TravisCI build

* Fix CMD in Dockerfiles

* Openhab GROUP_ID can now be set via variable at container creation time

* Fix #104

* Add shadow package for alpine

* Change entrypoint.sh

* Fix entrypoint.sh for alpine and version 1.8.3

* Add generated entrypoint.sh

*  Update readme for new alpine docker images
2017-10-12 00:12:39 +02:00
Tim Sedlmeyer 81906ef02f Openhab GROUP_ID can now be set via variable at container creation time. (#104) 2017-09-14 22:56:19 +02:00
Dominik Krickl-Vorreiter 645e59a120 Clarify user configuration (#106) 2017-09-14 21:01:38 +02:00
Martin van Wingerden 1a4920cd83 Add tty true for compatibility with the openHAB 2.2 (#103)
Add tty true to make sure the example is compatible with version 2.2 of openHAB

Fixes #102

Signed-off-by: Martin van Wingerden <martinvw@mtin.nl>
2017-09-14 16:13:36 +02:00
Christian Häussler e566484125 Add Docker Banner
Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)
2017-07-25 13:43:01 +02:00
Christian Häussler 9fa5fe1afc Add MAINTAINER section (#98)
* Add MAINTAINER section
2017-06-29 23:36:53 +02:00
Christian Häussler f53a1fcc08 Add version 2.2.0-snapshot (#97)
* Add version 2.2.0-snapshot
2017-06-29 22:47:07 +02:00
Christian Häussler ece744c958 Add Version 2.1.0 (#96)
* Add 2.1.0 and 2.2.0-SNAPSHOT Versions

* Update README to Version 2.1.0

* Echo actual `NEW_USER_ID`, instead of hardcoded/default id=9001.

* Fix sudo enabled environment for travis

* RUN chmod +x on entrypoint.sh within Dockerfile to fix permission issue

Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)
2017-06-28 23:39:27 +02:00
Hans van den Bogert 228423bd9c Update entrypoint.sh (#94)
Echo actual `NEW_USER_ID`, instead of hardcoded/default id=9001.
2017-06-28 21:10:11 +02:00
legacycode 7d60e758a1 Hot fix for issue #90 (#93)
* fixed broken build for arm64. migrated from ubuntu to debian jessie. migrated from oraclejdk to openjdk8

* Removed FLAVOR from build files. Rework on readme.md

* removed gosu integration check

* removed gosu integration check
2017-06-14 12:47:16 +02:00
legacycode 55c1dc134f documentation rework (#81)
We do not need manually copy the folders from the image to the mounted volume, because this is done by the entrypoint.sh script now.

Since we have no other solution for libpcap and zwave support we need to run the container as root. This is done by overriding the command in the Dockerfile. Setting the -u parameter is useless, because we use gosu.
2017-02-14 22:46:18 +01:00
Florian 1a26c7530c Install fontconfig for OH2 charts (#80)
For the charting feature, the system, where OH2 is running, needs to
have some fonts installed. The package fontconfig should depend on all
needed packages on all systems (a shared library to access fonts and
some fonts (on debian libfreetype6 e.g.)).

I tested this on a amd64 Ubuntu host, however, it should work on armhf
and arm64 platforms, too.

Fixes #73

Signed-off-by: Florian Schmidt <florian.schmidt.welzow@t-online.de>
2017-02-14 20:29:15 +01:00
legacycode 0227d3ef2b Added entrypoint and gosu (#75)
* added entryscript and gosu

* fix user creation

* removed patchelf

* create user openhab on start

* fixed build error. entryscript now differs between 1.8.3 and 2.0.0 versions.

* moved execution of command into Dockerfile to avoid openhab zombie process. The command can now be overriden on on first execution by the user.
2017-02-11 13:06:24 +01:00
legacycode aab2ac1a71 updated documentation. added libpcap support and table of content (#70) 2017-02-02 20:00:07 +01:00
legacycode 7436da8fc0 Added locales and libpcap-dev (#69)
* added localed and libpcap-dev package

* added locales

* added variables to documentation

* added netbase for pcap4j. it installs /etc/services that is used by the amazon dashbutton plugin.

* 1.8.3 is now generated from update.sh. added locales and libpcap
2017-02-01 19:36:04 +01:00
Christian Häussler 7a19a82832 Add docker image for version 1.8.3 (#68)
* Initial OH1 1.8.3 Image

Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)

* Add OH1 1.8.3 version

Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)

* Fix Dockerfile permission issue

Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)

* added features from 2.1.0-snapshot to stable version 1.8.3

Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)

* Delete entrypoint.sh

Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)

* Fix arm64 32bit fallback

Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)

* Add Java alternatives path

Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)
2017-02-01 15:44:47 +01:00
legacycode 0d2ad02be5 added features from 2.1.0-snapshot to stable version 2.0.0 (#66) 2017-01-30 20:35:34 +01:00
legacycode 9b7028bb19 starting docker using named data container. easier for beginners. (#62) 2017-01-30 00:18:52 +01:00
Christian 'Pelle' Pelster 4929672341 Update README.md (#63)
Update README.md to include the default password for the client login.
2017-01-29 23:33:52 +01:00
legacycode 6d22251cbf Openhab USER_ID can now be set via variable at container creation time. (#61)
* Openhab USER_ID can now be set via variable at container creation time.

* removed obsolete files.

* Update README.md

* Update README.md
2017-01-27 08:23:01 +01:00
legacycode 23dcb5d1f1 Update .travis.yml (#60)
Fix broken build.
2017-01-26 19:44:03 +01:00
Christian Häussler 0452d0600f Add version tags for doker hub and change badgets
Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)
2017-01-26 08:44:52 +01:00
legacycode 7544f91693 Created 2.1.0-snapshot version for development (#58)
* fixed broken build for arm64. migrated from ubuntu to debian jessie. migrated from oraclejdk to openjdk8

* Removed FLAVOR from build files. Rework on readme.md

* initial commit for version 2.1.0-snapshot to better track changes.

* oved to azul zulu java, removed entryfile and gosu. image layers optimized.
2017-01-26 08:02:11 +01:00
legacycode e8373e6b6f Updatescript created for maintaining verion files. (#56)
* fixed broken build for arm64. migrated from ubuntu to debian jessie. migrated from oraclejdk to openjdk8

* Removed FLAVOR from build files. Rework on readme.md

* added update.sh, rework on folder structure, documentation updated.

* travis file updated to new structure and tags.

* fix travis file
2017-01-24 22:08:29 +01:00