From e65dc094a0b315864df34d025f93826ef015a324 Mon Sep 17 00:00:00 2001 From: benweet Date: Fri, 19 Jan 2018 23:32:14 +0000 Subject: [PATCH] Fixed Dockerfile --- Dockerfile | 3 +-- index.js | 17 +---------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7be2e835..cc9558e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,7 @@ RUN npm pack stackedit@$V4_VERSION \ WORKDIR /opt/stackedit -COPY package.json /opt/stackedit/ -COPY package-lock.lock /opt/stackedit/ +COPY package*json /opt/stackedit/ COPY gulpfile.js /opt/stackedit/ RUN npm install \ && npm cache clean --force diff --git a/index.js b/index.js index f549108e..7404ec99 100644 --- a/index.js +++ b/index.js @@ -7,28 +7,13 @@ Object.keys(env).forEach((key) => { }); const http = require('http'); -const https = require('https'); -const path = require('path'); const express = require('express'); -const fs = require('fs'); const app = express(); require('./server')(app, process.env.SERVE_V4); -let port = parseInt(process.env.PORT || 8080, 10); -if (port === 443) { - const credentials = { - key: fs.readFileSync(path.join(__dirname, 'ssl.key'), 'utf8'), - cert: fs.readFileSync(path.join(__dirname, 'ssl.crt'), 'utf8'), - ca: fs.readFileSync(path.join(__dirname, 'ssl.ca'), 'utf8').split('\n\n'), - }; - const httpsServer = https.createServer(credentials, app); - httpsServer.listen(port, null, () => { - console.log('HTTPS server started: https://localhost'); - }); - port = 80; -} +const port = parseInt(process.env.PORT || 8080, 10); const httpServer = http.createServer(app); httpServer.listen(port, null, () => { console.log(`HTTP server started: http://localhost:${port}`);