Skip to content

Commit 85786e6

Browse files
committed
made dockerfile work with 2022
1 parent 86703c3 commit 85786e6

File tree

4 files changed

+108
-3
lines changed

4 files changed

+108
-3
lines changed

Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ COPY . /var/cbeam-telemetry-server
1717

1818
# Install MsgFlo and dependencies
1919
RUN npm install --only=production
20+
RUN npm run build
21+
RUN cp -rf ./node_modules/openmct/dist ./openmct
2022

2123
# Set OpenMCT location
2224
ENV OPENMCT_ROOT openmct

config/c-base.js

+2
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ station.addMeasurement('load_high', 'powermon.load_high', [
102102
], {
103103
topic: 'system/powermon/load_high'
104104
});
105+
/*
105106
station.addMeasurement('kdg_rx', 'echelon.kdg.rx', [
106107
{
107108
units: 'bytes',
@@ -150,6 +151,7 @@ station.addMeasurement('ipb_tx', 'echelon.ipb.tx', [
150151
}, function (traffic) {
151152
return traffic.interfaces[1].tx;
152153
});
154+
*/
153155
station.addMeasurement('vacuum', 'device.vacuum', [
154156
{
155157
units: 'on',

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "index.js",
66
"scripts": {
77
"test": "grunt test",
8-
"build": "cd node_modules/openmct && npm install && npm run prepare",
8+
"build": "cp patched-openmct-package.json node_modules/openmct/package.json && cd node_modules/openmct && npm install && npm install --dev && npm run prepare",
99
"start": "node config/eva.js"
1010
},
1111
"repository": {
@@ -31,10 +31,10 @@
3131
"express": "^4.15.3",
3232
"influx": "^5.0.7",
3333
"mqtt": "^2.3.0",
34-
"websocket": "^1.0.26"
34+
"websocket": "^1.0.26",
35+
"openmct": "git+https://github.com/nasa/openmct.git#v0.13.3"
3536
},
3637
"devDependencies": {
37-
"openmct": "git://github.com/nasa/openmct.git#v0.13.3"
3838
},
3939
"config": {
4040
"unsafe-perm": true

patched-openmct-package.json

+101
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
{
2+
"_from": "git+https://github.com/nasa/openmct.git#v0.13.3",
3+
4+
"_inBundle": false,
5+
"_integrity": "",
6+
"_location": "/openmct",
7+
"_phantomChildren": {},
8+
"_requested": {
9+
"type": "git",
10+
"raw": "openmct@git+https://github.com/nasa/openmct.git#v0.13.3",
11+
"name": "openmct",
12+
"escapedName": "openmct",
13+
"rawSpec": "git+https://github.com/nasa/openmct.git#v0.13.3",
14+
"saveSpec": "git+https://github.com/nasa/openmct.git#v0.13.3",
15+
"fetchSpec": "https://github.com/nasa/openmct.git",
16+
"gitCommittish": "v0.13.3"
17+
},
18+
"_requiredBy": [
19+
"/"
20+
],
21+
"_resolved": "git+https://github.com/nasa/openmct.git#8da6f05825b42e9d85cb82e05a122aa7d75f1846",
22+
"_spec": "openmct@git+https://github.com/nasa/openmct.git#v0.13.3",
23+
"_where": "/var/cbeam-telemetry-server",
24+
"author": "",
25+
"bugs": {
26+
"url": "https://github.com/nasa/openmct/issues"
27+
},
28+
"bundleDependencies": false,
29+
"dependencies": {
30+
"d3-array": "1.2.0",
31+
"d3-axis": "1.0.0",
32+
"d3-collection": "1.0.0",
33+
"d3-color": "1.0.0",
34+
"d3-format": "1.2.0",
35+
"d3-interpolate": "1.1.0",
36+
"d3-scale": "1.0.0",
37+
"d3-selection": "1.3.0",
38+
"d3-time": "1.0.0",
39+
"d3-time-format": "2.1.0",
40+
"express": "^4.13.1",
41+
"minimist": "^1.1.1",
42+
"request": "^2.69.0",
43+
"vue": "^2.5.6"
44+
},
45+
"deprecated": false,
46+
"description": "The Open MCT core platform",
47+
"devDependencies": {
48+
"bower": "^1.7.7",
49+
"git-rev-sync": "^1.4.0",
50+
"glob": ">= 3.0.0",
51+
"gulp": "^3.9.1",
52+
"gulp-jscs": "^3.0.2",
53+
"gulp-jshint": "^2.0.0",
54+
"gulp-jshint-html-reporter": "^0.1.3",
55+
"gulp-rename": "^1.2.2",
56+
"gulp-requirejs-optimize": "^0.3.1",
57+
"gulp-sass": "^3.1.0",
58+
"gulp-sourcemaps": "^1.6.0",
59+
"jasmine-core": "^2.3.0",
60+
"jscs-html-reporter": "^0.1.0",
61+
"jsdoc": "^3.3.2",
62+
"jshint": "^2.7.0",
63+
"karma": "^0.13.3",
64+
"karma-chrome-launcher": "^0.1.12",
65+
"karma-cli": "0.0.4",
66+
"karma-coverage": "^0.5.3",
67+
"karma-html-reporter": "^0.2.7",
68+
"karma-jasmine": "^0.1.5",
69+
"karma-junit-reporter": "^0.3.8",
70+
"karma-requirejs": "^0.2.2",
71+
"lodash": "^3.10.1",
72+
"markdown-toc": "^0.11.7",
73+
"marked": "^0.3.5",
74+
"merge-stream": "^1.0.0",
75+
"mkdirp": "^0.5.1",
76+
"moment": "^2.11.1",
77+
"node-bourbon": "^4.2.3",
78+
"requirejs": "2.1.x",
79+
"split": "^1.0.0",
80+
"v8-compile-cache": "^1.1.0"
81+
},
82+
"homepage": "https://github.com/nasa/openmct#readme",
83+
"license": "Apache-2.0",
84+
"name": "openmct",
85+
"private": true,
86+
"repository": {
87+
"type": "git",
88+
"url": "git+https://github.com/nasa/openmct.git"
89+
},
90+
"scripts": {
91+
"docs": "npm run jsdoc ; npm run otherdoc",
92+
"jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
93+
"jshint": "jshint platform example",
94+
"otherdoc": "node docs/gendocs.js --in docs/src --out dist/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
95+
"prepare": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install",
96+
"start": "node app.js",
97+
"test": "karma start --single-run",
98+
"watch": "karma start"
99+
},
100+
"version": "0.13.3"
101+
}

0 commit comments

Comments
 (0)