flywithu/community-catalog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add alpine and debian image distributions

Browse Source 
Signed-off-by: Wouter Born <eclipse@maindrain.net>
This commit is contained in:
Wouter Born
2017-10-16 00:23:19 +02:00
parent 570b38e272
commit 1660872487
8 changed files with 72 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/openhab/0/docker-compose.yml.tpl
+1 -1
View File
@@ -23,7 +23,7 @@ services:
{{- end}}
OPENHAB_HTTP_PORT: "${HTTP_PORT}"
OPENHAB_HTTPS_PORT: "${HTTPS_PORT}"
image: "openhab/openhab:1.8.3-${IMAGE_ARCHITECTURE}"
image: "openhab/openhab:1.8.3-${IMAGE_ARCHITECTURE}-${IMAGE_DISTRIBUTION}"
{{- if ne .Values.HOST_LABEL ""}}
labels:
io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
templates/openhab/0/rancher-compose.yml
+17 -7
View File
@@ -19,6 +19,16 @@ catalog:
- armhf
- arm64
- variable: "IMAGE_DISTRIBUTION"
label: "Image Distribution"
description: "The distribution on which the container image is based"
required: true
default: "debian"
type: enum
options:
- alpine
- debian
- variable: "NETWORK_MODE"
label: "Network Mode"
description: "The network stack to connect the container to"
@@ -30,6 +40,13 @@ catalog:
- bridge
- none
- variable: "HOST_LABEL"
label: "Host Label"
description: "Schedules openHAB to run only on hosts that have a specific label. Example: 'openhab=true'"
default: ""
type: "string"
required: false
- variable: "USE_HOST_TIME"
label: "Use Host Time"
description: "Adds /etc/localtime and /etc/timezone as volumes from the host for providing timezone information"
@@ -84,13 +101,6 @@ catalog:
- rancher-efs
- rancher-nfs
- variable: "HOST_LABEL"
label: "Host Label"
description: "Schedules openHAB to run only on hosts that have a specific label. Example: 'openhab=true'"
default: ""
type: "string"
required: false
- variable: "EXTRA_JAVA_OPTS"
label: "Extra Java Options"
description: "Starts the openHAB JVM with the provided extra options. Example: '-Dgnu.io.rxtx.SerialPorts=/dev/ttyAMA0:/dev/zwave'"
templates/openhab/1/docker-compose.yml.tpl
+1 -1
View File
@@ -23,7 +23,7 @@ services:
{{- end}}
OPENHAB_HTTP_PORT: "${HTTP_PORT}"
OPENHAB_HTTPS_PORT: "${HTTPS_PORT}"
image: "openhab/openhab:2.0.0-${IMAGE_ARCHITECTURE}"
image: "openhab/openhab:2.0.0-${IMAGE_ARCHITECTURE}-${IMAGE_DISTRIBUTION}"
{{- if ne .Values.HOST_LABEL ""}}
labels:
io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
templates/openhab/1/rancher-compose.yml
+17 -7
View File
@@ -20,6 +20,16 @@ catalog:
- armhf
- arm64
- variable: "IMAGE_DISTRIBUTION"
label: "Image Distribution"
description: "The distribution on which the container image is based"
required: true
default: "debian"
type: enum
options:
- alpine
- debian
- variable: "NETWORK_MODE"
label: "Network Mode"
description: "The network stack to connect the container to"
@@ -31,6 +41,13 @@ catalog:
- bridge
- none
- variable: "HOST_LABEL"
label: "Host Label"
description: "Schedules openHAB to run only on hosts that have a specific label. Example: 'openhab=true'"
default: ""
type: "string"
required: false
- variable: "USE_HOST_TIME"
label: "Use Host Time"
description: "Adds /etc/localtime and /etc/timezone as volumes from the host for providing timezone information"
@@ -85,13 +102,6 @@ catalog:
- rancher-efs
- rancher-nfs
- variable: "HOST_LABEL"
label: "Host Label"
description: "Schedules openHAB to run only on hosts that have a specific label. Example: 'openhab=true'"
default: ""
type: "string"
required: false
- variable: "EXTRA_JAVA_OPTS"
label: "Extra Java Options"
description: "Starts the openHAB JVM with the provided extra options. Example: '-Dgnu.io.rxtx.SerialPorts=/dev/ttyAMA0:/dev/zwave'"
templates/openhab/2/docker-compose.yml.tpl
+1 -1
View File
@@ -23,7 +23,7 @@ services:
{{- end}}
OPENHAB_HTTP_PORT: "${HTTP_PORT}"
OPENHAB_HTTPS_PORT: "${HTTPS_PORT}"
image: "openhab/openhab:2.1.0-${IMAGE_ARCHITECTURE}"
image: "openhab/openhab:2.1.0-${IMAGE_ARCHITECTURE}-${IMAGE_DISTRIBUTION}"
{{- if ne .Values.HOST_LABEL ""}}
labels:
io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
templates/openhab/2/rancher-compose.yml
+17 -7
View File
@@ -20,6 +20,16 @@ catalog:
- armhf
- arm64
- variable: "IMAGE_DISTRIBUTION"
label: "Image Distribution"
description: "The distribution on which the container image is based"
required: true
default: "debian"
type: enum
options:
- alpine
- debian
- variable: "NETWORK_MODE"
label: "Network Mode"
description: "The network stack to connect the container to"
@@ -31,6 +41,13 @@ catalog:
- bridge
- none
- variable: "HOST_LABEL"
label: "Host Label"
description: "Schedules openHAB to run only on hosts that have a specific label. Example: 'openhab=true'"
default: ""
type: "string"
required: false
- variable: "USE_HOST_TIME"
label: "Use Host Time"
description: "Adds /etc/localtime and /etc/timezone as volumes from the host for providing timezone information"
@@ -85,13 +102,6 @@ catalog:
- rancher-efs
- rancher-nfs
- variable: "HOST_LABEL"
label: "Host Label"
description: "Schedules openHAB to run only on hosts that have a specific label. Example: 'openhab=true'"
default: ""
type: "string"
required: false
- variable: "EXTRA_JAVA_OPTS"
label: "Extra Java Options"
description: "Starts the openHAB JVM with the provided extra options. Example: '-Dgnu.io.rxtx.SerialPorts=/dev/ttyAMA0:/dev/zwave'"
templates/openhab/3/docker-compose.yml.tpl
+1 -1
View File
@@ -23,7 +23,7 @@ services:
{{- end}}
OPENHAB_HTTP_PORT: "${HTTP_PORT}"
OPENHAB_HTTPS_PORT: "${HTTPS_PORT}"
image: "openhab/openhab:2.2.0-snapshot-${IMAGE_ARCHITECTURE}"
image: "openhab/openhab:2.2.0-snapshot-${IMAGE_ARCHITECTURE}-${IMAGE_DISTRIBUTION}"
labels:
io.rancher.container.pull_image: always
{{- if ne .Values.HOST_LABEL ""}}
templates/openhab/3/rancher-compose.yml
+17 -7
View File
@@ -20,6 +20,16 @@ catalog:
- armhf
- arm64
- variable: "IMAGE_DISTRIBUTION"
label: "Image Distribution"
description: "The distribution on which the container image is based"
required: true
default: "debian"
type: enum
options:
- alpine
- debian
- variable: "NETWORK_MODE"
label: "Network Mode"
description: "The network stack to connect the container to"
@@ -31,6 +41,13 @@ catalog:
- bridge
- none
- variable: "HOST_LABEL"
label: "Host Label"
description: "Schedules openHAB to run only on hosts that have a specific label. Example: 'openhab=true'"
default: ""
type: "string"
required: false
- variable: "USE_HOST_TIME"
label: "Use Host Time"
description: "Adds /etc/localtime and /etc/timezone as volumes from the host for providing timezone information"
@@ -85,13 +102,6 @@ catalog:
- rancher-efs
- rancher-nfs
- variable: "HOST_LABEL"
label: "Host Label"
description: "Schedules openHAB to run only on hosts that have a specific label. Example: 'openhab=true'"
default: ""
type: "string"
required: false
- variable: "EXTRA_JAVA_OPTS"
label: "Extra Java Options"
description: "Starts the openHAB JVM with the provided extra options. Example: '-Dgnu.io.rxtx.SerialPorts=/dev/ttyAMA0:/dev/zwave'"