Merge branch 'develop', prepare 5.0.4

Author: yamalight

.prettierrc

@@ -0,0 +1,6 @@
+{
+  "trailingComma": "es5",
+  "singleQuote": true,
+  "bracketSpacing": false,
+  "printWidth": 120
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "exoframe-server",
-  "version": "5.0.3",
+  "version": "5.0.4-dev",
   "description": "Exoframe is a self-hosted tool that allows simple one-command deployments using Docker",
   "main": "bin/server-core.js",
   "bin": "bin/exoframe-server.js",
@@ -24,38 +24,38 @@
   "license": "MIT",
   "devDependencies": {
     "@zeit/ncc": "^0.20.4",
-    "babel-eslint": "^10.0.2",
+    "babel-eslint": "^10.0.3",
     "cors": "^2.8.4",
-    "coveralls": "^3.0.5",
+    "coveralls": "^3.0.6",
     "dockerode": "^2.5.6",
-    "eslint": "^6.0.1",
-    "eslint-config-prettier": "^6.0.0",
-    "eslint-config-standard": "^13.0.1",
-    "eslint-plugin-import": "^2.18.0",
+    "eslint": "^6.2.2",
+    "eslint-config-prettier": "^6.1.0",
+    "eslint-config-standard": "^14.1.0",
+    "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-node": "^9.1.0",
     "eslint-plugin-prettier": "^3.1.0",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.0",
+    "eslint-plugin-standard": "^4.0.1",
     "exoframe-faas": "^1.0.1",
-    "fastify": "^2.6.0",
+    "fastify": "^2.7.1",
     "fastify-auth": "^0.5.0",
     "get-port": "^5.0.0",
-    "highland": "^2.13.0",
-    "jest": "^24.0.0",
+    "highland": "^2.13.5",
+    "jest": "^24.9.0",
     "js-yaml": "^3.12.0",
     "jsonwebtoken": "^8.3.0",
-    "lodash": "^4.17.14",
-    "lokijs": "^1.5.5",
+    "lodash": "^4.17.15",
+    "lokijs": "^1.5.7",
     "mkdirp": "^0.5.1",
     "nock": "^10.0.4",
     "node-fetch": "^2.6.0",
     "prettier": "^1.18.2",
-    "rimraf": "^2.6.2",
+    "rimraf": "^3.0.0",
     "semver-compare": "^1.0.0",
     "signale": "^1.3.0",
     "sshpk": "^1.14.2",
     "tar-fs": "^2.0.0",
-    "uuid": "^3.3.2"
+    "uuid": "^3.3.3"
   },
   "jest": {
     "testEnvironment": "node"

src/config/index.js

@@ -89,7 +89,7 @@ const defaultConfig = {
   baseDomain: false,
   cors: false,
   updateChannel: 'stable',
-  traefikImage: 'traefik:latest',
+  traefikImage: 'traefik:v1.7',
   traefikName: 'exoframe-traefik',
   traefikArgs: [],
   exoframeNetwork: 'exoframe',

src/docker/templates/node.js

@@ -29,6 +29,9 @@ ${yarnOrNpm({hasYarn, hasLock})}
 # copy app itself
 COPY . /usr/src/app
 
+# run build if needed
+RUN npm run build --if-present
+
 EXPOSE 80
 
 CMD ["npm", "start"]

src/routes/version.js

@@ -9,10 +9,16 @@ const pkg = require('../../package.json');
 // urls for tags request
 const exoServerUrl = `https://api.github.com/repos/exoframejs/exoframe-server/releases`;
 const traefikUrl = 'https://api.github.com/repos/containous/traefik/releases';
+const traefikVersionPrefix = 'v1.7';
 
-const getLatestVersion = async url => {
+const getLatestVersion = async (url, versionPrefix) => {
   const res = await fetch(url).then(r => r.json());
-  const latestRelease = res.filter(r => !r.draft && !r.prerelease).shift();
+  const latestRelease = res
+    // filter out drafts and pre-releases
+    .filter(r => !r.draft && !r.prerelease)
+    // if version prefix is provided - filter out releases that don't match it
+    .filter(r => (versionPrefix ? r.tag_name.startsWith(versionPrefix) : true))
+    .shift();
   return latestRelease.tag_name;
 };
 
@@ -32,7 +38,7 @@ module.exports = fastify => {
         }
         // get latest versions
         const lastServerTag = await getLatestVersion(exoServerUrl);
-        const lastTraefikTag = await getLatestVersion(traefikUrl);
+        const lastTraefikTag = await getLatestVersion(traefikUrl, traefikVersionPrefix);
         // reply
         reply.code(200).send({
           server: pkg.version,

test/__mocks__/config.js

@@ -25,7 +25,7 @@ const testConfig = {
   },
   compress: true,
   updateChannel: 'stable',
-  traefikImage: 'traefik:latest',
+  traefikImage: 'traefik:v1.7',
   traefikName: 'exoframe-traefik',
   traefikArgs: [],
   exoframeNetwork: 'exoframe',

test/deploy.test.js

@@ -601,8 +601,8 @@ test('Should display error log for broken Node.js project', async done => {
   // check response
   expect(response.statusCode).toEqual(200);
   expect(error.message).toEqual('Build failed! See build log for details.');
-  expect(error.log[0].includes('Step 1/8 : FROM node:latest')).toBeTruthy();
-  expect(error.log.find(l => l.includes('Step 2/8 : RUN mkdir -p /usr/src/app'))).toBeDefined();
+  expect(error.log[0].includes('FROM node:latest')).toBeTruthy();
+  expect(error.log.find(l => l.includes('RUN mkdir -p /usr/src/app'))).toBeDefined();
   expect(error.log[error.log.length - 1]).toEqual(
     "The command '/bin/sh -c npm install --silent' returned a non-zero code: 1"
   );

test/update.test.js

@@ -14,6 +14,8 @@ const {sleep} = require('../src/util');
 
 // old traefik and server images
 const traefikTag = 'traefik:1.3-alpine';
+const traefikVersion = 'v1.7';
+const traefikNewTag = `traefik:${traefikVersion}`;
 const serverTag = 'exoframe/server:1.0.0';
 
 // options base
@@ -43,7 +45,7 @@ beforeAll(async () => {
   // get all images
   const oldImages = await docker.listImages();
   // remove current :latest images
-  const latestTraefik = oldImages.find(img => img.RepoTags && img.RepoTags.includes('traefik:latest'));
+  const latestTraefik = oldImages.find(img => img.RepoTags && img.RepoTags.includes(traefikNewTag));
   if (latestTraefik) {
     const limg = docker.getImage(latestTraefik.Id);
     await limg.remove({force: true});
@@ -61,7 +63,7 @@ beforeAll(async () => {
   // get old one and tag it as latest
   oldTraefik = images.find(img => img.RepoTags && img.RepoTags.includes(traefikTag));
   const timg = docker.getImage(oldTraefik.Id);
-  await timg.tag({repo: 'traefik', tag: 'latest'});
+  await timg.tag({repo: 'traefik', tag: traefikVersion});
   oldServer = images.find(img => img.RepoTags && img.RepoTags.includes(serverTag));
   const simg = docker.getImage(oldServer.Id);
   await simg.tag({repo: 'exoframe/server', tag: 'latest'});
@@ -139,7 +141,7 @@ test('Should update traefik', async done => {
 
   // check docker services
   const allImages = await docker.listImages();
-  const newTraefik = allImages.find(it => it.RepoTags && it.RepoTags.includes('traefik:latest'));
+  const newTraefik = allImages.find(it => it.RepoTags && it.RepoTags.includes(traefikNewTag));
   expect(newTraefik.Id).not.toBe(oldTraefik.Id);
 
   done();