jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-19 07:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
pvizeli 2017-03-20 17:15:55 +01:00
parent 23b0d11e57
commit 4a33487477
9 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend
View File

@ -13,15 +13,8 @@ SUPERVISOR_TAG = "${HASSIO_SUPERVISOR_TAG}"
TARGET_REPOSITORY = "${SUPERVISOR_REPOSITORY}" TARGET_REPOSITORY = "${SUPERVISOR_REPOSITORY}"
TARGET_TAG = "${SUPERVISOR_TAG}" TARGET_TAG = "${SUPERVISOR_TAG}"
SRC_URI += " \
file://hassio.conf \
"
FILES_${PN} += " \
${sysconfdir} \
"
do_install_append () { do_install_append () {
install -m 0755 ${WORKDIR}/hassio.conf ${D}${sysconfdir}/ install -d ${D}${sysconfdir}/resin-supervisor
sed -i -e 's:@HOMEASSISTANT_REPOSITORY@:${HOMEASSISTANT_REPOSITORY}:g' ${D}${sysconfdir}/hassio.conf sed -i -e 's:@HOMEASSISTANT_REPOSITORY@:${HOMEASSISTANT_REPOSITORY}:g' ${D}${sysconfdir}/resin-supervisor/supervisor.conf
sed -i -e 's:@MACHINE@:${MACHINE}:g' ${D}${sysconfdir}/resin-supervisor/supervisor.conf
} }

1
meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/hassio.conf
View File

@ -1 +0,0 @@
HOMEASSISTANT_REPOSITORY=@HOMEASSISTANT_REPOSITORY@

1
meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/start-resin-supervisor
View File

@ -1,7 +1,6 @@
#!/bin/sh -e #!/bin/sh -e
source /usr/sbin/resin-vars source /usr/sbin/resin-vars
source /etc/hassio.conf
SUPERVISOR_IMAGE_ID=$(docker inspect --format='{{.Id}}' $SUPERVISOR_IMAGE) SUPERVISOR_IMAGE_ID=$(docker inspect --format='{{.Id}}' $SUPERVISOR_IMAGE)
SUPERVISOR_CONTAINER_IMAGE_ID=$(docker inspect --format='{{.Image}}' resin_supervisor || echo "") SUPERVISOR_CONTAINER_IMAGE_ID=$(docker inspect --format='{{.Image}}' resin_supervisor || echo "")

5
meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/supervisor.conf Normal file
View File

@ -0,0 +1,5 @@
SUPERVISOR_IMAGE=@SUPERVISOR_REPOSITORY@
SUPERVISOR_TAG=@SUPERVISOR_TAG@
LED_FILE=@LED_FILE@
MACHINE=@MACHINE@
HOMEASSISTANT_REPOSITORY=@HOMEASSISTANT_REPOSITORY@

15
meta-hassio/recipes-support/resinhub/resinhub.bbappend
View File

@ -1,15 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += " \
file://resinhub.conf \
"
FILES_${PN} += " \
${sysconfdir} \
"
do_install_append () {
install -m 0755 ${WORKDIR}/resinhub.conf ${D}${sysconfdir}/
sed -i -e 's:@RESINHUB_MACHINE@:${MACHINE}:g' ${D}${sysconfdir}/resinhub.conf
}

1
meta-hassio/recipes-support/resinhub/resinhub/resinhub.conf
View File

@ -1 +0,0 @@
RESINHUB_MACHINE=@RESINHUB_MACHINE@

2
meta-hassio/recipes-support/resinhup/resinhup.bbappend Normal file
View File

@ -0,0 +1,2 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

5
meta-hassio/recipes-support/resinhub/resinhub/run-resinhup.sh → meta-hassio/recipes-support/resinhup/resinhup/run-resinhup.sh
View File

@ -235,10 +235,9 @@ else
fi fi
# Detect slug # Detect slug
source /etc/resinhub.conf slug=$MACHINE
slug=$RESINHUB_MACHINE
if [ -z $slug ]; then if [ -z $slug ]; then
log ERROR "Can't detect slug from /etc/resinhub.conf" log ERROR "Can't detect slug from /etc/resin-supervisor/supervisor.conf ."
else else
log "Detected slug: $slug ." log "Detected slug: $slug ."
fi fi

8
supervisor/Dockerfile
View File

@ -14,7 +14,7 @@ ENV LANG C.UTF-8
RUN apk add --no-cache python3 git RUN apk add --no-cache python3 git
# install aiohttp # install aiohttp
RUN pip3 install pip --no-cache --upgrade \ RUN pip3 install pip --no-cache-dir --upgrade \
&& pip3 install --no-cache aiohttp \ && pip3 install --no-cache-dir aiohttp \
&& pip3 install --no-cache docker \ && pip3 install --no-cache-dir docker \
&& pip3 install --no-cache colorlog && pip3 install --no-cache-dir colorlog