mirror of
https://github.com/balena-os/balena-supervisor.git
synced 2024-12-22 15:02:23 +00:00
1722286a87
Restructure the supervisor image to remove the dependency on the custom `alpine-supervisor-base`
image and the custom node build. The dockerfile is now a multi-stage
build that splits the process into two build stages and two runtime
stages.
Here is the full list of changes
- The node binary is now copied from `balenalib/${ARCH}-alpine-node:12-run`, the node binary
now supports running with a debugger.
- The runtime image now inherits from the official `alpine:3.16` image
- Tests are ran within the runtime image configuration instead of the
build image
- Livepush is ran within the runtime image context
- Unnecessary packages have been removed
- Removed avahi-daemon.conf as that service is not being used
- Fix livepush to work with a multi-stage image. This also deprecates the `image-tag` argument to npm run sync as
`SUPERVISOR_TAG` is no longer used by new OSs
- Fix livepush build on old rpi devices. Allows passing a 'PREFIX'
argument to let the builder pull images directly from docker hub arch
repositories. Relates to https://github.com/balena-os/balena-engine/issues/269
Change-type: patch
105 lines
2.6 KiB
TypeScript
105 lines
2.6 KiB
TypeScript
import * as livepush from 'livepush';
|
|
import { promises as fs } from 'fs';
|
|
import * as yargs from 'yargs';
|
|
|
|
import * as packageJson from '../package.json';
|
|
import * as device from './device';
|
|
import * as init from './init';
|
|
import { startLivepush } from './livepush';
|
|
import { setupLogs } from './logs';
|
|
|
|
const helpText = `Sync changes code to a running supervisor on a device on the local network
|
|
|
|
Usage:
|
|
npm run sync <device IP>
|
|
`;
|
|
|
|
const argv = yargs
|
|
.command(
|
|
'$0 <device-address>',
|
|
'Sync changes in code to a running debug mode supervisor on a local device',
|
|
(y) =>
|
|
y.positional('device-address', {
|
|
type: 'string',
|
|
describe: 'The address of a local device',
|
|
}),
|
|
)
|
|
.option('device-arch', {
|
|
alias: 'a',
|
|
type: 'string',
|
|
description:
|
|
'Specify the device architecture (use this when the automatic detection fails)',
|
|
choices: ['amd64', 'i386', 'aarch64', 'armv7hf', 'rpi'],
|
|
})
|
|
.options('image-name', {
|
|
alias: 'i',
|
|
type: 'string',
|
|
description: 'Specify the name to use for the supervisor image on device',
|
|
default: `livepush-supervisor-${packageJson.version}`,
|
|
})
|
|
.options('image-tag', {
|
|
alias: 't',
|
|
type: 'string',
|
|
description:
|
|
'Specify the tag to use for the supervisor image on device. It will not have any effect on balenaOS >= v2.89.0',
|
|
default: 'latest',
|
|
deprecated: true,
|
|
})
|
|
.options('nocache', {
|
|
description: 'Run the intial build without cache',
|
|
type: 'boolean',
|
|
default: false,
|
|
})
|
|
.usage(helpText)
|
|
.version(false)
|
|
.scriptName('npm run sync --')
|
|
.alias('h', 'help').argv;
|
|
|
|
(async () => {
|
|
const address = argv['device-address']!;
|
|
const dockerfile = new livepush.Dockerfile(
|
|
await fs.readFile('Dockerfile.template'),
|
|
);
|
|
|
|
let cleanup = () => Promise.resolve();
|
|
let sigint = () => {
|
|
/** ignore empty */
|
|
};
|
|
|
|
try {
|
|
const docker = device.getDocker(address);
|
|
const { containerId, stageImages } = await init.initDevice({
|
|
address,
|
|
docker,
|
|
dockerfile,
|
|
imageName: argv['image-name'],
|
|
imageTag: argv['image-tag'],
|
|
arch: argv['device-arch'],
|
|
nocache: argv['nocache'],
|
|
});
|
|
// Another newline to separate build and livepush output
|
|
console.log(`Supervisor container: ${containerId}\n`);
|
|
|
|
await setupLogs(docker, containerId);
|
|
cleanup = await startLivepush({
|
|
dockerfile,
|
|
containerId,
|
|
docker,
|
|
noinit: true,
|
|
stageImages,
|
|
});
|
|
|
|
await new Promise((_, reject) => {
|
|
sigint = () => reject(new Error('User interrupt (Ctrl+C) received'));
|
|
process.on('SIGINT', sigint);
|
|
});
|
|
} catch (e) {
|
|
console.error('Error:', e.message);
|
|
} finally {
|
|
console.info('Cleaning up. Please wait ...');
|
|
await cleanup();
|
|
process.removeListener('SIGINT', sigint);
|
|
process.exit(1);
|
|
}
|
|
})();
|