From b4bbdaaf229d7f20d991550db003ab7d66b0e776 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 5 Jan 2022 17:12:18 -0500 Subject: [PATCH] fixed up container --- Dockerfile | 7 +++---- config.json | 34 ---------------------------------- config.yaml | 29 +++++++++++++++++++++++++++++ docker-compose.yaml | 2 +- 4 files changed, 33 insertions(+), 39 deletions(-) delete mode 100644 config.json create mode 100644 config.yaml diff --git a/Dockerfile b/Dockerfile index 1284dbc..d2ca70b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,9 +44,8 @@ ENV BUILD_VERSION $BUILD_VERSION EXPOSE 8000 LABEL \ - io.hass.version="${BUILD_VERSION}" \ - io.hass.type="addon" \ - io.hass.arch="armhf|aarch64|i386|amd64" + io.hass.type="addon" \ + io.hass.arch="armhf|aarch64|i386|amd64" -CMD [ "/run.sh" ] +CMD [ "/data/run.sh" ] diff --git a/config.json b/config.json deleted file mode 100644 index 1f46e8d..0000000 --- a/config.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "Shortumation", - "version": "0.0.4b", - "slug": "shortumation", - "url": "https://github.com/asosnovsky/Shortumation", - "description": "A homeassitant addon which provides better UI for automations & scripts.", - "arch": [ - "armhf", - "armv7", - "aarch64", - "amd64", - "i386" - ], - "startup": "application", - "boot": "auto", - "ingress": true, - "ingress_port": 8000, - "ingress_entry": "/web", - "panel_icon": "mdi:home-automation", - "hassio_role": "manager", - "auth_api": true, - "privileged": ["SYS_RAWIO"], - "host_network": true, - "map": [ - "config:rw" - ], - "options": {}, - "ports": { - "8000/tcp": 8000 - }, - "ports_description": { - "8000/tcp": "Main port for the API & Web." - } -} diff --git a/config.yaml b/config.yaml new file mode 100644 index 0000000..2f51a66 --- /dev/null +++ b/config.yaml @@ -0,0 +1,29 @@ +name: Shortumation +version: 0.0.4c +slug: shortumation +url: "https: //github.com/asosnovsky/Shortumation" +description: "A homeassitant addon which provides better UI for automations & scripts." +arch: + - armhf + - armv7 + - aarch64 + - amd64 + - i386 +startup: application +boot: auto +ingress: true +ingress_port: 8000 +ingress_entry: "/web" +panel_icon: mdi:home-automation +hassio_role: manager +auth_api: true +privileged: + - SYS_RAWIO +host_network: true +map: + - config:rw +options: {} +ports: + 8000/tcp: 8000 +ports_description: + 8000/tcp: Main port for the API & Web. diff --git a/docker-compose.yaml b/docker-compose.yaml index c64ad7c..5d284e3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3' services: addon: - image: "shortumation:${BUILD_TAG:-latest}" + image: "local/shortumation:${BUILD_TAG:-latest}" build: context: "./" dockerfile: "./Dockerfile"