From 63346f7e38cccb1229938608a633262c2c7959c3 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 9 Oct 2021 23:12:26 +0200 Subject: [PATCH] Pushed version 1.6.9 --- .env | 2 +- CHANGELOG.md | 3 +++ README.md | 14 -------------- client/.env | 2 +- controllers/apps.js | 18 +++++++++++------- 5 files changed, 16 insertions(+), 23 deletions(-) diff --git a/.env b/.env index de0f091..feb0686 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ PORT=5005 NODE_ENV=development -VERSION=1.6.8 \ No newline at end of file +VERSION=1.6.9 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ab36d7..1d2320b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### v1.6.9 (2021-10-09) +- Added option for remote docker host ([#97](https://github.com/pawelmalak/flame/issues/97)) + ### v1.6.8 (2021-10-05) - Implemented migration system for database diff --git a/README.md b/README.md index c3b81e2..e3fd2d7 100644 --- a/README.md +++ b/README.md @@ -150,20 +150,6 @@ To use search bar you need to type your search query with selected prefix. For e 2. Get lat/long for your location. You can get them from [latlong.net](https://www.latlong.net/convert-address-to-lat-long.html). 3. Enter and save data. Weather widget will now update and should be visible on Home page. -### Supported URL formats for applications and bookmarks - -#### Rules - -- URL starts with `http://` - - Format: `http://www.domain.com`, `http://domain.com` - - Redirect: `{dest}` -- URL starts with `https://` - - Format: `https://www.domain.com`, `https://domain.com` - - Redirect: `https://{dest}` -- URL without protocol - - Format: `www.domain.com`, `domain.com`, `sub.domain.com`, `local`, `ip`, `ip:port` - - Redirect: `http://{dest}` - ### Docker integration In order to use the Docker integration, each container must have the following labels: diff --git a/client/.env b/client/.env index afab507..e9f8924 100644 --- a/client/.env +++ b/client/.env @@ -1 +1 @@ -REACT_APP_VERSION=1.6.8 \ No newline at end of file +REACT_APP_VERSION=1.6.9 \ No newline at end of file diff --git a/controllers/apps.js b/controllers/apps.js index dfb5e0c..4376d15 100644 --- a/controllers/apps.js +++ b/controllers/apps.js @@ -66,18 +66,22 @@ exports.getApps = asyncWrapper(async (req, res, next) => { let containers = null; const host = await Config.findOne({ - where: { key: 'dockerHost' } + where: { key: 'dockerHost' }, }); try { - if(host.value.includes('localhost')) { - let { data } = await axios.get(`http://${host.value}/containers/json?{"status":["running"]}`, - { - socketPath: '/var/run/docker.sock' - }); + if (host.value.includes('localhost')) { + let { data } = await axios.get( + `http://${host.value}/containers/json?{"status":["running"]}`, + { + socketPath: '/var/run/docker.sock', + } + ); containers = data; } else { - let { data } = await axios.get(`http://${host.value}/containers/json?{"status":["running"]}`); + let { data } = await axios.get( + `http://${host.value}/containers/json?{"status":["running"]}` + ); containers = data; } } catch {