ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-04-15 06:56:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #886 from balena-io/fix-override-lock

Browse Source 
Fix override locking from the dashboard
This commit is contained in:
CameronDiver 2019-02-04 13:52:54 +00:00 committed by GitHub
commit 59bba13348
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -47,9 +47,9 @@ RUN apt-get update \
wget \
&& rm -rf /var/lib/apt/lists/
COPY package.json /usr/src/app/
COPY package.json package-lock.json /usr/src/app/
RUN JOBS=MAX npm install --no-optional --unsafe-perm
RUN JOBS=MAX npm ci --no-optional --unsafe-perm || JOBS=MAX npm install --no-optional --unsafe-perm
COPY webpack.config.js fix-jsonstream.js hardcode-migrations.js tsconfig.json /usr/src/app/
COPY src /usr/src/app/src
@ -83,10 +83,12 @@ RUN apt-get update \
RUN mkdir -p rootfs-overlay && \
ln -s /lib rootfs-overlay/lib64
COPY package.json /usr/src/app/
COPY package.json package-lock.json /usr/src/app/
# Install only the production modules that have C extensions
RUN JOBS=MAX npm install --production --no-optional --unsafe-perm \
# First try to install with npm ci, then fallback to npm install
RUN (JOBS=MAX npm ci --production --no-optional --unsafe-perm || \
JOBS=MAX npm install --production --no-optional --unsafe-perm) \
&& npm dedupe
# Remove various uneeded filetypes in order to reduce space

14
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "balena-supervisor",
"version": "9.3.1",
"version": "9.6.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -8780,9 +8780,9 @@
}
},
"source-map-support": {
"version": "0.5.9",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
"integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
"version": "0.5.10",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
"integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
"dev": true,
"requires": {
"buffer-from": "^1.0.0",
@ -9164,9 +9164,9 @@
"dev": true
},
"terser": {
"version": "3.11.0",
"resolved": "https://registry.npmjs.org/terser/-/terser-3.11.0.tgz",
"integrity": "sha512-5iLMdhEPIq3zFWskpmbzmKwMQixKmTYwY3Ox9pjtSklBLnHiuQ0GKJLhL1HSYtyffHM3/lDIFBnb82m9D7ewwQ==",
"version": "3.14.1",
"resolved": "https://registry.npmjs.org/terser/-/terser-3.14.1.tgz",
"integrity": "sha512-NSo3E99QDbYSMeJaEk9YW2lTg3qS9V0aKGlb+PlOrei1X02r1wSBHCNX/O+yeTRFSWPKPIGj6MqvvdqV4rnVGw==",
"dev": true,
"requires": {
"commander": "~2.17.1",

1
package.json
View File

@ -92,6 +92,7 @@
"rwlock": "^5.0.0",
"shell-quote": "^1.6.1",
"strict-event-emitter-types": "^2.0.0",
"terser": "^3.14.1",
"ts-loader": "^5.3.0",
"typed-error": "^2.0.0",
"typescript": "^3.2.2",

13
src/device-config.ts
View File

@ -127,7 +127,7 @@ export class DeviceConfig {
static validKeys = [
'SUPERVISOR_VPN_CONTROL',
'OVERRRIDE_LOCK',
'OVERRIDE_LOCK',
..._.map(DeviceConfig.configKeys, 'envVarName'),
];
@ -216,9 +216,15 @@ export class DeviceConfig {
const db = trx != null ? trx : this.db.models.bind(this.db);
const formatted = await this.formatConfigKeys(target);
// check for legacy keys
if (formatted['OVERRIDE_LOCK'] != null) {
formatted['SUPERVISOR_OVERRIDE_LOCK'] = formatted['OVERRIDE_LOCK'];
}
const confToUpdate = {
targetValues: JSON.stringify(formatted),
};
await db('deviceConfig').update(confToUpdate);
}
@ -356,11 +362,6 @@ export class DeviceConfig {
const humanReadableConfigChanges: Dictionary<string> = {};
let reboot = false;
// If the legacy lock override is used, place it as the new variable
if (checkTruthy(target['OVERRIDE_LOCK'])) {
target['SUPERVISOR_OVERRIDE_LOCK'] = target['OVERRIDE_LOCK'];
}
_.each(
DeviceConfig.configKeys,
({ envVarName, varType, rebootRequired }, key) => {