Pushed version 1.6.9

This commit is contained in:
unknown 2021-10-09 23:12:26 +02:00
parent 65a33f16fd
commit 63346f7e38
5 changed files with 16 additions and 23 deletions

2
.env
View file

@ -1,3 +1,3 @@
PORT=5005
NODE_ENV=development
VERSION=1.6.8
VERSION=1.6.9

View file

@ -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

View file

@ -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:

View file

@ -1 +1 @@
REACT_APP_VERSION=1.6.8
REACT_APP_VERSION=1.6.9

View file

@ -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 {