mirror of
https://github.com/home-assistant/supervisor.git
synced 2025-07-16 05:36:29 +00:00
Update meta-hassio
This commit is contained in:
Pascal Vizeli
parent
c948599a65
commit
6e1dbfa838
@ -20,8 +20,8 @@ cleanup() {
|
||||
trap 'cleanup fail' SIGINT SIGTERM
|
||||
|
||||
# Sanity checks
|
||||
if [ "$#" -ne 1 ]; then
|
||||
echo "Usage: create_resinos.sh <MACHINE>"
|
||||
if [ "$#" -ne 2 ]; then
|
||||
echo "Usage: create_resinos.sh <MACHINE> <SUPERVISOR_TAG>"
|
||||
echo "Optional environment: BUILD_DIR, PERSISTENT_WORKDIR, RESIN_BRANCH"
|
||||
exit 1
|
||||
fi
|
||||
@ -51,8 +51,6 @@ case $MACHINE in
|
||||
;;
|
||||
esac
|
||||
|
||||
HASSIO_SUPERVISOR=pvizeli/${ARCH}-hassio-supervisor
|
||||
|
||||
echo "[INFO] Checkout repository"
|
||||
mkdir -p $BUILD_DIR
|
||||
cd $BUILD_DIR && git clone $RESIN_REPO resin-board
|
||||
@ -62,7 +60,7 @@ fi
|
||||
cd $WORKSPACE && git submodule update --init --recursive
|
||||
|
||||
# Additional variables
|
||||
BARYS_ARGUMENTS_VAR="-a RESIN_CONNECTABLE=0 -a DEVELOPMENT_IMAGE=0 -a TARGET_REPOSITORY=$HASSIO_SUPERVISOR"
|
||||
BARYS_ARGUMENTS_VAR="-a HASSIO_SUPERVISOR_TAG=$SUPERVISOR_TAG"
|
||||
|
||||
# Make sure shared directories are in place
|
||||
mkdir -p $DOWNLOAD_DIR
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
SUPERVISOR_REPOSITORY_armv5 = "pvizeli/armhf-hassio-supervisor"
|
||||
SUPERVISOR_REPOSITORY_armv6 = "pvizeli/armhf-hassio-supervisor"
|
||||
SUPERVISOR_REPOSITORY_armv7a = "pvizeli/armhf-hassio-supervisor"
|
||||
SUPERVISOR_REPOSITORY_armv7ve = "pvizeli/armhf-hassio-supervisor"
|
||||
SUPERVISOR_REPOSITORY_aarch64 = "pvizeli/aarch64-hassio-supervisor"
|
||||
SUPERVISOR_REPOSITORY_x86 = "pvizeli/i386-hassio-supervisor"
|
||||
SUPERVISOR_REPOSITORY_x86-64 = "pvizeli/amd64-hassio-supervisor"
|
||||
|
||||
SUPERVISOR_TAG = "${HASSIO_SUPERVISOR_TAG}"
|
||||
TARGET_REPOSITORY = "${SUPERVISOR_REPOSITORY}"
|
||||
TARGET_TAG = "${SUPERVISOR_TAG}"
|
||||
@ -0,0 +1,27 @@
|
||||
#!/bin/sh -e
|
||||
|
||||
source /usr/sbin/resin-vars
|
||||
|
||||
SUPERVISOR_IMAGE_ID=$(docker inspect --format='{{.Id}}' $SUPERVISOR_IMAGE)
|
||||
SUPERVISOR_CONTAINER_IMAGE_ID=$(docker inspect --format='{{.Image}}' resin_supervisor || echo "")
|
||||
|
||||
runSupervisor() {
|
||||
docker rm --force resin_supervisor || true
|
||||
docker run --privileged --name resin_supervisor \
|
||||
--net=host \
|
||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||
-v $CONFIG_PATH:/boot/config.json \
|
||||
-v /resin-data/resin-supervisor:/data \
|
||||
-v /proc/net/fib_trie:/mnt/fib_trie \
|
||||
-v /var/log/supervisor-log:/var/log \
|
||||
-v /:/mnt/root \
|
||||
-e DOCKER_ROOT=/mnt/root/var/lib/docker \
|
||||
-e DOCKER_SOCKET=/var/run/docker.sock \
|
||||
-e BOOT_MOUNTPOINT=$BOOT_MOUNTPOINT \
|
||||
-e LED_FILE=${LED_FILE} \
|
||||
-e LISTEN_PORT=$LISTEN_PORT \
|
||||
-e SUPERVISOR_IMAGE=${SUPERVISOR_IMAGE} \
|
||||
${SUPERVISOR_IMAGE}
|
||||
}
|
||||
|
||||
([ "$SUPERVISOR_IMAGE_ID" == "$SUPERVISOR_CONTAINER_IMAGE_ID" ] && docker start --attach resin_supervisor) || runSupervisor
|
||||
@ -0,0 +1,129 @@
|
||||
#!/bin/bash
|
||||
set -o pipefail
|
||||
|
||||
# Help function
|
||||
function update-resin-supervisor-help {
|
||||
cat << EOF
|
||||
Wrapper to run supervisor agent updates on resin distributions.
|
||||
$0 <OPTION>
|
||||
|
||||
Options:
|
||||
-h, --help
|
||||
Display this help and exit.
|
||||
|
||||
-i <SUPERVISOR IMAGE>, --supervisor-image <SUPERVISOR IMAGE>
|
||||
Set supervisor image to update to.
|
||||
|
||||
-t <SUPERVISOR TAG>, --supervisor-tag <SUPERVISOR TAG>
|
||||
Set supervisor tag to update to.
|
||||
EOF
|
||||
}
|
||||
|
||||
# Parse arguments
|
||||
while [[ $# > 0 ]]; do
|
||||
arg="$1"
|
||||
|
||||
case $arg in
|
||||
-h|--help)
|
||||
update-resin-supervisor-help
|
||||
exit 0
|
||||
;;
|
||||
-i|--supervisor-image)
|
||||
if [ -z "$2" ]; then
|
||||
log ERROR "\"$1\" argument needs a value."
|
||||
fi
|
||||
UPDATER_SUPERVISOR_IMAGE=$2
|
||||
shift
|
||||
;;
|
||||
-t|--supervisor-tag)
|
||||
if [ -z "$2" ]; then
|
||||
log ERROR "\"$1\" argument needs a value."
|
||||
fi
|
||||
UPDATER_SUPERVISOR_TAG=$2
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
log ERROR "Unrecognized option $1."
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
# Don't souce before parsing args - resin-vars parses args too
|
||||
source /usr/sbin/resin-vars
|
||||
|
||||
# A temporary file used until next reboot
|
||||
UPDATECONF=/tmp/update-supervisor.conf
|
||||
|
||||
if [ -z "$API_ENDPOINT" -o -z "$CONFIG_PATH" ]; then
|
||||
echo "Environment variables API_ENDPOINT and CONFIG_PATH must be set."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
function error_handler {
|
||||
# If docker pull fails, start the old supervisor again and exit
|
||||
rm -rf $UPDATECONF
|
||||
systemctl start resin-supervisor
|
||||
exit 1
|
||||
}
|
||||
|
||||
trap 'error_handler $LINENO' ERR
|
||||
|
||||
# Detect containers engine
|
||||
if which docker &>/dev/null; then
|
||||
DOCKER=docker
|
||||
elif which rce &>/dev/null; then
|
||||
DOCKER=rce
|
||||
else
|
||||
error_handler $LINENO "no container engine detected"
|
||||
fi
|
||||
|
||||
source /etc/resin-supervisor/supervisor.conf
|
||||
if [ -z "$UPDATER_SUPERVISOR_TAG" ]; then
|
||||
# Try to get the tag from supervisor.conf
|
||||
if [ -n "$SUPERVISOR_TAG" ]; then
|
||||
UPDATER_SUPERVISOR_TAG=$SUPERVISOR_TAG
|
||||
else
|
||||
echo "ERROR: No tag argument provided."
|
||||
error_handler $LINENO "no tag argument provided"
|
||||
fi
|
||||
fi
|
||||
if [ -z "$UPDATER_SUPERVISOR_IMAGE" ]; then
|
||||
UPDATER_SUPERVISOR_IMAGE=$SUPERVISOR_IMAGE
|
||||
fi
|
||||
echo "Set based on arguments image=$UPDATER_SUPERVISOR_IMAGE and tag=$UPDATER_SUPERVISOR_TAG."
|
||||
image_name=$UPDATER_SUPERVISOR_IMAGE
|
||||
tag=$UPDATER_SUPERVISOR_TAG
|
||||
|
||||
# Get image id of tag. This will be non-empty only in case it's already downloaded.
|
||||
echo "Getting image id..."
|
||||
imageid=$($DOCKER inspect -f '{{.Id}}' "$image_name:$tag") || imageid=""
|
||||
|
||||
if [ -n "$imageid" ]; then
|
||||
echo "Supervisor $image_name:$tag already downloaded."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Try to stop old supervisor to prevent it deleting the intermediate images while downloading the new one
|
||||
echo "Stop supervisor..."
|
||||
systemctl stop resin-supervisor
|
||||
|
||||
# Pull target version.
|
||||
echo "Pulling supervisor $image_name:$tag..."
|
||||
$DOCKER pull "$image_name:$tag"
|
||||
|
||||
$DOCKER rm --force resin_supervisor || true
|
||||
|
||||
# Store the tagged image string so resin-supervisor.service can pick it up
|
||||
echo "SUPERVISOR_IMAGE=$image_name:$tag" > $UPDATECONF
|
||||
|
||||
# Run supervisor with the device-type-specific options.
|
||||
# We give a specific name to the container to guarantee only one running.
|
||||
echo "Start supervisor..."
|
||||
systemctl start resin-supervisor
|
||||
|
||||
# Mark supervisor as working. This version will run when the device reboots.
|
||||
echo "Mark pulled tag as latest..."
|
||||
$DOCKER tag -f "$image_name:$tag" "$image_name:latest"
|
||||
sed --in-place "s|SUPERVISOR_IMAGE=.*|SUPERVISOR_IMAGE=$image_name|" /etc/resin-supervisor/supervisor.conf
|
||||
sed --in-place "s|SUPERVISOR_TAG=.*|SUPERVISOR_TAG=$tag|" /etc/resin-supervisor/supervisor.conf
|
||||
Loading…
x
Reference in New Issue
Block a user