Merge branch 'develop', prepare v6.0

Author: yamalight

.travis.yml

@@ -5,7 +5,7 @@ language: node_js
 services:
   - docker
 
-node_js: 12
+node_js: lts/erbium
 
 cache: yarn
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.6-alpine
+FROM node:12.11-alpine
 
 # install docker-compose
 RUN apk update \

Dockerfile-debug

@@ -1,4 +1,4 @@
-FROM node:lts
+FROM node:12
 
 # install required libs, docker-compose and yarn
 RUN apt-get update && apt-get install python-pip -y && pip install docker-compose

package.json

@@ -1,6 +1,6 @@
 {
   "name": "exoframe-server",
-  "version": "5.0.4",
+  "version": "5.0.5-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",
@@ -23,31 +23,31 @@
   "author": "Tim Ermilov <[email protected]>",
   "license": "MIT",
   "devDependencies": {
-    "@zeit/ncc": "^0.20.4",
+    "@zeit/ncc": "^0.20.5",
     "babel-eslint": "^10.0.3",
     "cors": "^2.8.4",
-    "coveralls": "^3.0.6",
-    "dockerode": "^2.5.6",
-    "eslint": "^6.2.2",
-    "eslint-config-prettier": "^6.1.0",
+    "coveralls": "^3.0.7",
+    "dockerode": "^3.0.2",
+    "eslint": "^6.6.0",
+    "eslint-config-prettier": "^6.5.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-node": "^10.0.0",
+    "eslint-plugin-prettier": "^3.1.1",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
     "exoframe-faas": "^1.0.1",
-    "fastify": "^2.7.1",
-    "fastify-auth": "^0.5.0",
+    "fastify": "^2.10.0",
+    "fastify-auth": "^0.6.0",
     "get-port": "^5.0.0",
     "highland": "^2.13.5",
     "jest": "^24.9.0",
     "js-yaml": "^3.12.0",
     "jsonwebtoken": "^8.3.0",
     "lodash": "^4.17.15",
-    "lokijs": "^1.5.7",
+    "lokijs": "^1.5.8",
     "mkdirp": "^0.5.1",
-    "nock": "^10.0.4",
+    "nock": "^11.7.0",
     "node-fetch": "^2.6.0",
     "prettier": "^1.18.2",
     "rimraf": "^3.0.0",

src/config/index.js

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

src/docker/init.js

@@ -1,37 +1,10 @@
-// npm modules
-const os = require('os');
-const fs = require('fs');
-const path = require('path');
-const mkdirp = require('mkdirp');
-
 // our modules
 const {getConfig, waitForConfig} = require('../config');
 const docker = require('./docker');
 const logger = require('../logger');
 const {initNetwork} = require('./network');
 const {getPlugins} = require('../plugins');
-
-// config vars
-const baseFolder = path.join(os.homedir(), '.exoframe');
-
-// pull image
-const pullImage = tag =>
-  new Promise(async (resolve, reject) => {
-    let log = '';
-    docker.pull(tag, (err, stream) => {
-      if (err) {
-        logger.error('Error pulling:', err);
-        reject(err);
-        return;
-      }
-      stream.on('data', d => {
-        const line = d.toString();
-        log += line;
-      });
-      stream.once('end', () => resolve(log));
-    });
-  });
-exports.pullImage = pullImage;
+const {initTraefik} = require('./traefik');
 
 // export default function
 exports.initDocker = async () => {
@@ -44,20 +17,6 @@ exports.initDocker = async () => {
   // get config
   const config = getConfig();
 
-  // check if traefik management is disabled
-  if (!config.traefikImage) {
-    logger.info('Traefik managment disabled, skipping init..');
-    return;
-  }
-
-  // build acme path
-  const acmePath = path.join(baseFolder, 'traefik', 'acme');
-  try {
-    fs.statSync(acmePath);
-  } catch (e) {
-    mkdirp.sync(acmePath);
-  }
-
   // run init via plugins if available
   const plugins = getPlugins();
   logger.debug('Got plugins, running init:', plugins);
@@ -75,102 +34,6 @@ exports.initDocker = async () => {
     }
   }
 
-  // get all containers
-  const allContainers = await docker.listContainers({all: true});
-  // try to find traefik instance
-  const traefik = allContainers.find(c => c.Names.find(n => n.startsWith(`/${config.traefikName}`)));
-
-  // if traefik exists and running - just return
-  if (traefik && !traefik.Status.includes('Exited')) {
-    logger.info('Traefik already running, docker init done!');
-    return;
-  }
-
-  // if container is exited - remove and recreate
-  if (traefik && traefik.Status.startsWith('Exited')) {
-    logger.info('Exited traefik instance found, re-creating...');
-    const traefikContainer = docker.getContainer(traefik.Id);
-    // remove
-    await traefikContainer.remove();
-  }
-
-  // pull image if needed
-  const allImages = await docker.listImages();
-  const traefikImage = allImages.find(img => img.RepoTags && img.RepoTags.includes(config.traefikImage));
-  if (!traefikImage) {
-    logger.info('No traefik image found, pulling..');
-    const pullLog = await pullImage(config.traefikImage);
-    logger.debug(pullLog);
-  }
-
-  // debug flags
-  const debug = ['--debug', '--logLevel=DEBUG'];
-
-  // letsencrypt flags
-  const letsencrypt = [
-    '--acme',
-    `--acme.email=${config.letsencryptEmail}`,
-    '--acme.storage=/var/acme/acme.json',
-    '--acme.httpchallenge.entrypoint=http',
-    '--acme.entrypoint=https',
-    '--acme.onhostrule=true',
-    '--accesslogsfile=/var/acme/access.log',
-    `--entryPoints=Name:https Address::443 TLS ${config.compress ? 'Compress:on' : 'Compress:off'}`,
-    `--entryPoints=Name:http Address::80 Redirect.EntryPoint:https ${config.compress ? 'Compress:on' : 'Compress:off'}`,
-    '--defaultEntryPoints=https,http',
-  ];
-
-  // entrypoints without letsencrypt
-  const entrypoints = [
-    `--entryPoints=Name:http Address::80 ${config.compress ? 'Compress:on' : 'Compress:off'}`,
-    '--defaultEntryPoints=http',
-  ];
-
-  // construct command
-  const Cmd = [
-    '-c',
-    '/dev/null',
-    '--docker',
-    '--docker.watch',
-    ...(config.letsencrypt ? letsencrypt : entrypoints),
-    ...(config.debug ? debug : []),
-    ...(config.traefikArgs || []),
-  ];
-
-  const Labels = {
-    'exoframe.deployment': 'exo-traefik',
-    'exoframe.user': 'admin',
-  };
-
-  const RestartPolicy = {
-    Name: 'on-failure',
-    MaximumRetryCount: 2,
-  };
-
-  // start traefik in docker
-  const container = await docker.createContainer({
-    Image: config.traefikImage,
-    name: config.traefikName,
-    Cmd,
-    Labels,
-    ExposedPorts: {
-      '80/tcp': {},
-      '443/tcp': {},
-    },
-    HostConfig: {
-      RestartPolicy,
-      Binds: ['/var/run/docker.sock:/var/run/docker.sock', `${acmePath}:/var/acme`],
-      PortBindings: {
-        '80/tcp': [{HostPort: '80'}],
-        '443/tcp': [{HostPort: '443'}],
-      },
-    },
-  });
-  // connect traefik to exoframe net
-  await exoNet.connect({
-    Container: container.id,
-  });
-  // start container
-  await container.start();
-  logger.info('Traefik instance started..');
+  // run traefik init
+  await initTraefik(exoNet);
 };