ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-20 17:52:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mount docker socket under /host/run for services

Browse Source 
Currently, when the label `io.balena.features.balena-socket` is set,
the balena engine socket is mounted under `/run/balena-engine.sock`.

This causes a problem when using systemd inside the container, since
this service remounts `/run` and `/run/lock` as tmpfs, causing the
socket to become unavailable.

Making a mount of the socket into `/host/run` solves this issue. This is
the same approach taken with DBUS.

Change-type: patch
Signed-off-by: Felipe Lalanne <felipe@balena.io>
Connects-to: #1494
This commit is contained in:
Felipe Lalanne 2020-10-21 16:51:30 -03:00
parent 4e380136c2
commit 01477e41b8
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compose/utils.ts
View File

@ -344,13 +344,19 @@ export async function addFeaturesFromLabels(
? service.config.volumes.push('/lib/firmware:/lib/firmware')
: null,
'io.balena.features.balena-socket': () => {
service.config.volumes.push(
`${constants.dockerSocket}:${constants.containerDockerSocket}`,
);
// Maintain the /var/run mount for backwards compatibility
service.config.volumes.push(
`${constants.dockerSocket}:${constants.dockerSocket}`,
);
if (service.config.environment['DOCKER_HOST'] == null) {
service.config.environment[
'DOCKER_HOST'
] = `unix://${constants.dockerSocket}`;
] = `unix://${constants.containerDockerSocket}`;
}
// We keep balena.sock for backwards compatibility
if (constants.dockerSocket !== '/var/run/balena.sock') {

4
src/lib/constants.ts
View File

@ -11,6 +11,10 @@ const constants = {
checkString(process.env.DATABASE_PATH) || '/data/database.sqlite',
containerId: checkString(process.env.SUPERVISOR_CONTAINER_ID) || undefined,
dockerSocket: process.env.DOCKER_SOCKET || '/var/run/docker.sock',
// In-container location for docker socket
// Mount in /host/run to avoid clashing with systemd
containerDockerSocket: '/host/run/balena-engine.sock',
supervisorImage:
checkString(process.env.SUPERVISOR_IMAGE) || 'resin/rpi-supervisor',
ledFile:

25
test/04-service.spec.ts
View File

@ -8,6 +8,7 @@ import {
ServiceComposeConfig,
ServiceConfig,
} from '../src/compose/types/service';
import * as constants from '../src/lib/constants';
const configs = {
simple: {
@ -270,6 +271,30 @@ describe('compose/service', () => {
]);
});
it('should correctly handle io.balena.features.balena-socket label', async () => {
const service = await Service.fromComposeObject(
{
appId: 123456,
serviceId: 123456,
serviceName: 'foobar',
labels: {
'io.balena.features.balena-socket': '1',
},
},
{ appName: 'test' } as any,
);
expect(service.config.volumes).to.include.members([
`${constants.dockerSocket}:${constants.dockerSocket}`,
`${constants.dockerSocket}:/host/run/balena-engine.sock`,
`${constants.dockerSocket}:/var/run/balena.sock`,
]);
expect(service.config.environment['DOCKER_HOST']).to.equal(
'unix:///host/run/balena-engine.sock',
);
});
describe('Ordered array parameters', () => {
it('Should correctly compare ordered array parameters', async () => {
const svc1 = await Service.fromComposeObject(