From 16608724872bb1719300d2dab74b7058debdc830 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Mon, 16 Oct 2017 00:23:19 +0200 Subject: [PATCH] Add alpine and debian image distributions Signed-off-by: Wouter Born --- templates/openhab/0/docker-compose.yml.tpl | 2 +- templates/openhab/0/rancher-compose.yml | 24 +++++++++++++++------- templates/openhab/1/docker-compose.yml.tpl | 2 +- templates/openhab/1/rancher-compose.yml | 24 +++++++++++++++------- templates/openhab/2/docker-compose.yml.tpl | 2 +- templates/openhab/2/rancher-compose.yml | 24 +++++++++++++++------- templates/openhab/3/docker-compose.yml.tpl | 2 +- templates/openhab/3/rancher-compose.yml | 24 +++++++++++++++------- 8 files changed, 72 insertions(+), 32 deletions(-) diff --git a/templates/openhab/0/docker-compose.yml.tpl b/templates/openhab/0/docker-compose.yml.tpl index 6308f82..4c0c657 100644 --- a/templates/openhab/0/docker-compose.yml.tpl +++ b/templates/openhab/0/docker-compose.yml.tpl @@ -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} diff --git a/templates/openhab/0/rancher-compose.yml b/templates/openhab/0/rancher-compose.yml index 8088950..2b448d5 100644 --- a/templates/openhab/0/rancher-compose.yml +++ b/templates/openhab/0/rancher-compose.yml @@ -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'" diff --git a/templates/openhab/1/docker-compose.yml.tpl b/templates/openhab/1/docker-compose.yml.tpl index bfb51c6..197c50e 100644 --- a/templates/openhab/1/docker-compose.yml.tpl +++ b/templates/openhab/1/docker-compose.yml.tpl @@ -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} diff --git a/templates/openhab/1/rancher-compose.yml b/templates/openhab/1/rancher-compose.yml index 705f3c1..30bc8d3 100644 --- a/templates/openhab/1/rancher-compose.yml +++ b/templates/openhab/1/rancher-compose.yml @@ -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'" diff --git a/templates/openhab/2/docker-compose.yml.tpl b/templates/openhab/2/docker-compose.yml.tpl index 266d06f..2c7aaa6 100644 --- a/templates/openhab/2/docker-compose.yml.tpl +++ b/templates/openhab/2/docker-compose.yml.tpl @@ -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} diff --git a/templates/openhab/2/rancher-compose.yml b/templates/openhab/2/rancher-compose.yml index 8db4290..336e9c2 100644 --- a/templates/openhab/2/rancher-compose.yml +++ b/templates/openhab/2/rancher-compose.yml @@ -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'" diff --git a/templates/openhab/3/docker-compose.yml.tpl b/templates/openhab/3/docker-compose.yml.tpl index ea9adc7..c423f96 100644 --- a/templates/openhab/3/docker-compose.yml.tpl +++ b/templates/openhab/3/docker-compose.yml.tpl @@ -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 ""}} diff --git a/templates/openhab/3/rancher-compose.yml b/templates/openhab/3/rancher-compose.yml index 83756ab..65fea0d 100644 --- a/templates/openhab/3/rancher-compose.yml +++ b/templates/openhab/3/rancher-compose.yml @@ -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'"