SQ

Author: alexgg

automation/entry_scripts/balena-deploy-block.sh

@@ -22,23 +22,19 @@ if [ "$ESR" = "true" ]; then
 	APPNAME="${APPNAME}-esr"
 fi
 
+# Use /deploy folder to generate compose file to use local images that live there
 # Use a release dir to limit context
-RELEASE_DIR="/deploy/release"
-mkdir "${RELEASE_DIR}"
+RELEASE_DIR=$(balena_docker_create_compose_file "${MACHINE}" "${API_ENV}" "${RELEASE_VERSION}" "${BALENAOS_TOKEN}" "${BLOCKS}" "/deploy")
+if [ ! -f "${RELEASE_DIR}/docker-compose.yml" ]; then
+	echo "[ERROR] Failed to generate compose file"
+	exit 1
+fi
+
 if [ -f "/deploy/balena.yml" ]; then
 	cp "/deploy/balena.yml" "${RELEASE_DIR}"
 	echo -e "\nversion: $(balena_lib_get_os_version)" >> "${RELEASE_DIR}/balena.yml"
 fi
 
-# use /deploy folder to generate compose file to use local images that live there
-balena_docker_create_compose_file "${MACHINE}" "${API_ENV}" "${RELEASE_VERSION}" "${BALENAOS_TOKEN}" "${BLOCKS}" "/deploy"
-if [ ! -f "/deploy/docker-compose.yml" ]; then
-	echo "[ERROR] Failed to generate compose file"
-	exit 1
-else
-	cp "/deploy/docker-compose.yml" "${RELEASE_DIR}"
-fi
-
 echo "[INFO] Deploying  to ${BALENAOS_ACCOUNT}/$APPNAME"
 balena_api_create_public_app "${APPNAME}" "${BALENARC_BALENA_URL}" "${MACHINE}" "${balenaCloudEmail}" "${balenaCloudPassword}" "${ESR}" "${BOOTABLE}"
 _releaseID=$(balena_lib_release "${BALENAOS_ACCOUNT}/$APPNAME" "${FINAL}" "${RELEASE_DIR}" "${API_ENV}")

automation/include/balena-docker.inc

@@ -216,8 +216,9 @@ __add_compose_service() {
 	if [ "${_image}" = "*/*:*" ]; then
 		printf "    image: %s\n" "${_image}" >> "${_path}/docker-compose.yml"
 	else
-		printf "    build: ./\n" >> "${_path}/docker-compose.yml"
-		echo "FROM ${_image}" > "${_path}/Dockerfile"
+		printf "    build: %s\n" "${_service_name}" >> "${_path}/docker-compose.yml"
+		mkdir "${_path}/${_service_name}"
+		echo "FROM ${_image}" > "${_path}/${_service_name}/Dockerfile"
 	fi
 	printf "    labels:\n" >> "${_path}/docker-compose.yml"
 	if [ -n "${_image_class}" ]; then
@@ -262,11 +263,13 @@ balena_docker_create_compose_file() {
 	local _image_id
 	local _local_image
 	local _bootable
+	local _release_path="${_work_dir}/release"
 
 	[ -z "${_device_type}" ] && return
 	_version=${_version:-$(balena_lib_get_os_version)}
 	_apiEnv=${_apiEnv:-"balena-cloud.com"}
 
+	mkdir -p "${_release_path}"
 	[ -z "${_blocks}" ] && >&2 echo "Blocks are required" && return 1
 	for _block in ${_blocks}; do
 		# Try to find a hostapp container image first
@@ -300,7 +303,7 @@ balena_docker_create_compose_file() {
 		_reboot_required=$(balena_lib_get_label_from_image "${_image_id}" "${BALENA_HOSTOS_BLOCK_REQUIRES_REBOOT}")
 		[ -z "${_reboot_required}" ] && _reboot_required="1"
 		_bootable=$(balena_api_is_bootable "${_block}" "${_apiEnv}" "${_token}")
-		__add_compose_service "${_work_dir}" "${_block}" "${_block_image}" "${_class}" "${_reboot_required}" "${_store}" "${_bootable}"
+		__add_compose_service "${_release_path}" "${_block}" "${_block_image}" "${_class}" "${_reboot_required}" "${_store}" "${_bootable}"
 	done
-	echo "${_work_dir}"
+	echo "${_release_path}"
 }