diff --git a/helpers/mu/server.js b/helpers/mu/server.js index 9ff7aeb..f0a113d 100644 --- a/helpers/mu/server.js +++ b/helpers/mu/server.js @@ -4,8 +4,6 @@ import bodyParser from 'body-parser'; var app = express(); -var port = process.env.PORT || '80'; -var hostname = process.env.HOST || '0.0.0.0'; var bodySizeLimit = process.env.MAX_BODY_SIZE || '100kb'; // parse JSONAPI content type @@ -36,11 +34,6 @@ const errorHandler = function(err, req, res, next) { }); }; -// start server -app.listen( port, hostname, function() { - console.log(`Starting server on ${hostname}:${port} in ${app.get('env')} mode`); -}); - export default app; export { diff --git a/run-development.sh b/run-development.sh index f2f5ab1..f4a9b72 100755 --- a/run-development.sh +++ b/run-development.sh @@ -81,4 +81,4 @@ cp /usr/src/app/helpers/mu/package.json /usr/src/dist/node_modules/mu/ cd /usr/src/dist/ node \ --inspect="0.0.0.0:9229" \ - ./app.js + ./start-server.js diff --git a/run-production.sh b/run-production.sh index 248cc2d..b392768 100755 --- a/run-production.sh +++ b/run-production.sh @@ -39,8 +39,8 @@ then # boot transpiled sources cd /usr/src/dist/ - exec node ./app.js + exec node ./start-server.js else cd /usr/src/dist/ - exec node ./app.js + exec node ./start-server.js fi diff --git a/scripts/config.json b/scripts/config.json index 84f534f..a807a5a 100644 --- a/scripts/config.json +++ b/scripts/config.json @@ -1,5 +1,5 @@ { - "version": "0.1", + "version": "0.2", "scripts": [ { "documentation": { @@ -8,7 +8,6 @@ "arguments": [] }, "environment": { - "image": "ubuntu", "interactive": false, "script": "dev-script/run.sh" }, @@ -23,7 +22,6 @@ "arguments": [] }, "environment": { - "image": "semtech/mu-javascript-template:feature-dev-experience-tryouts", "interactive": false, "script": "setup-ide/run.sh" }, diff --git a/start-server.js b/start-server.js new file mode 100644 index 0000000..ce8dd3a --- /dev/null +++ b/start-server.js @@ -0,0 +1,10 @@ +import { app } from 'mu'; +import './app.js'; + +var port = process.env.PORT || '80'; +var hostname = process.env.HOST || '0.0.0.0'; + +// start server +app.listen(port, hostname, function () { + console.log(`Starting server on ${hostname}:${port} in ${app.get('env')} mode`); +}); diff --git a/transpile-sources.sh b/transpile-sources.sh index 2adff56..f5ed52e 100755 --- a/transpile-sources.sh +++ b/transpile-sources.sh @@ -79,3 +79,9 @@ popd > /dev/null ## merged template and app modules with mu module docker-rsync --delete /usr/src/app/app/node_modules /usr/src/dist/ docker-rsync /usr/src/app/app/package.json /usr/src/dist/package.json + + +######################### +# Add server start script +######################### +cp /usr/src/app/start-server.js /usr/src/dist/start-server.js