Rename the supervisor service to core on the commposition

This will allow it to show on the dashboard with that name in the
Supervisor services table.

Change-type: minor

Author: pipex

docker-compose.yml

@@ -1,10 +1,11 @@
 version: '2.3'
 
 services:
-  # This service can only be named `main` or `balena-supervisor` as older
-  # devices will keep relying on the `/v6/supervisor_release` endpoint that
-  # identifies the supervisor image by that service name.
-  balena-supervisor:
+  # This service can only be named `main`, `balena-supervisor` or `core`
+  # in a multi-container supervisor, the API `supervisor_release` needs to be able to
+  # identify the "main" supervisor image so the `update-balena-supervisor` script works
+  # properly
+  core:
     build: ./
     privileged: true
     tty: true

src/lib/supervisor-metadata.ts

@@ -1,8 +1,9 @@
 export type SupervisorMetadata = {
 	uuid: string;
-	serviceName: string;
 };
 
+const SUPERVISOR_SVC_NAMES = ['main', 'balena-supervisor', 'core'];
+
 /**
  * Although it might feel unsettling to hardcode these ids here.
  * the main purpose of app uuids is to have environment independent
@@ -13,31 +14,16 @@ export type SupervisorMetadata = {
  * This will only be necessary until the supervisor becomes an actual app
  * on balena
  */
-const SUPERVISOR_APPS: { [arch: string]: SupervisorMetadata } = {
-	amd64: {
-		uuid: '52e35121417640b1b28a680504e4039b',
-		serviceName: 'balena-supervisor',
-	},
-	aarch64: {
-		uuid: '900de4f3cbac4b9bbd232885a35e407b',
-		serviceName: 'balena-supervisor',
-	},
-	armv7hf: {
-		uuid: '2e66a95795c149959c69472a8c2f92b8',
-		serviceName: 'balena-supervisor',
-	},
-	i386: {
-		uuid: '531b357e155c480cbec0fdd33041a1f5',
-		serviceName: 'balena-supervisor',
-	},
-	rpi: {
-		uuid: '6822565f766e413e96d9bebe2227cdcc',
-		serviceName: 'balena-supervisor',
-	},
+const SUPERVISOR_APPS: { [arch: string]: string } = {
+	amd64: '52e35121417640b1b28a680504e4039b',
+	aarch64: '900de4f3cbac4b9bbd232885a35e407b',
+	armv7hf: '2e66a95795c149959c69472a8c2f92b8',
+	i386: '531b357e155c480cbec0fdd33041a1f5',
+	rpi: '6822565f766e413e96d9bebe2227cdcc',
 };
 
 export function isSupervisorApp(appUuid: string): boolean {
-	return Object.values(SUPERVISOR_APPS).some(({ uuid }) => uuid === appUuid);
+	return Object.values(SUPERVISOR_APPS).some((uuid) => uuid === appUuid);
 }
 
 /**
@@ -49,13 +35,8 @@ export function isSupervisorApp(appUuid: string): boolean {
  *
  * TODO: remove this once the supervisor knows how to update itself
  */
-
 export const isSupervisor = (appUuid: string, svcName: string) => {
-	return (
-		Object.values(SUPERVISOR_APPS).filter(
-			({ uuid, serviceName }) =>
-				// Compare with `main` as well for compatibility with older supervisors
-				appUuid === uuid && (svcName === serviceName || svcName === 'main'),
-		).length > 0
+	return Object.values(SUPERVISOR_APPS).some(
+		(uuid) => appUuid === uuid && SUPERVISOR_SVC_NAMES.includes(svcName),
 	);
 };