Inject layer into sample bblayers config

This commit is contained in:
pvizeli 2017-03-21 17:54:14 +01:00
parent d121f3bed8
commit 015d517e9d
2 changed files with 8 additions and 1 deletions

View File

@ -37,7 +37,8 @@ BASE_IMAGE="resin\/${MACHINE}-alpine-python:3.6"
DOCKER_TAG=$1 DOCKER_TAG=$1
DOCKER_IMAGE=${MACHINE}-homeassistant DOCKER_IMAGE=${MACHINE}-homeassistant
BUILD_DIR=${BUILD_DIR:=$SCRIPTPATH} BUILD_DIR=${BUILD_DIR:=$SCRIPTPATH}
WORKSPACE=${BUILD_DIR:=$SCRIPTPATH}/hass WORKSPACE=${BUILD_DIR}/hass
HASS_GIT=${BUILD_DIR}/hass_git
# setup docker # setup docker
echo "[INFO] Setup docker for homeassistant" echo "[INFO] Setup docker for homeassistant"
@ -50,6 +51,10 @@ cp ../../homeassistant/Dockerfile $WORKSPACE/Dockerfile
sed -i "s/%%BASE_IMAGE%%/${BASE_IMAGE}/g" $WORKSPACE/Dockerfile sed -i "s/%%BASE_IMAGE%%/${BASE_IMAGE}/g" $WORKSPACE/Dockerfile
sed -i "s/%%HASS_VERSION%%/${HASS_VERS}/g" $WORKSPACE/Dockerfile sed -i "s/%%HASS_VERSION%%/${HASS_VERS}/g" $WORKSPACE/Dockerfile
git https://github.com/home-assistant/home-assistant $HASS_GIT
cd $HASS_GIT && git checkout $HASS_VERS
cp $HASS_GIT/requirements.txt $WORKSPACE/
# Run build # Run build
echo "[INFO] start docker build" echo "[INFO] start docker build"
docker stop $BUILD_CONTAINER_NAME 2> /dev/null || true docker stop $BUILD_CONTAINER_NAME 2> /dev/null || true
@ -68,6 +73,7 @@ docker run --rm \
echo "[INFO] cleanup WORKSPACE" echo "[INFO] cleanup WORKSPACE"
cd $BUILD_DIR cd $BUILD_DIR
rm -rf $WORKSPACE rm -rf $WORKSPACE
rm -rf $HASS_GIT
cleanup cleanup
exit 0 exit 0

View File

@ -67,6 +67,7 @@ fi
echo "[INFO] Inject HassIO yocto layer" echo "[INFO] Inject HassIO yocto layer"
cp -fr $HASSIO_ROOT/meta-hassio $WORKSPACE/layers/ cp -fr $HASSIO_ROOT/meta-hassio $WORKSPACE/layers/
sed -i 's%${TOPDIR}/../layers/meta-resin/meta-resin-common \\%${TOPDIR}/../layers/meta-resin/meta-resin-common \\\n${TOPDIR}/../layers/meta-resin/meta-hassio \\%g' $WORKSPACE/layers/*/conf/samples/bblayers.conf.sample
# Additional variables # Additional variables
BARYS_ARGUMENTS_VAR="-a HASSIO_SUPERVISOR_TAG=$SUPERVISOR_TAG -a HOMEASSISTANT_REPOSITORY=$HOMEASSISTANT_REPOSITORY -a HASSIO_VERSION=$HASSIO_VERSION" BARYS_ARGUMENTS_VAR="-a HASSIO_SUPERVISOR_TAG=$SUPERVISOR_TAG -a HOMEASSISTANT_REPOSITORY=$HOMEASSISTANT_REPOSITORY -a HASSIO_VERSION=$HASSIO_VERSION"