Skip to content

Commit

Permalink
- Fix docker plugin icon
Browse files Browse the repository at this point in the history
- Fix version mess usin versions-maven-plugin
- Add environment variable to docker container details
- Fix DynDNS IP refresh date that was showing last check instead of last update
  • Loading branch information
lamarios committed Apr 22, 2017
1 parent aab282d commit 5cc0757
Show file tree
Hide file tree
Showing 21 changed files with 83 additions and 71 deletions.
3 changes: 1 addition & 2 deletions models/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
<parent>
<groupId>com.ftpix.homedash</groupId>
<artifactId>homedash</artifactId>
<version>LATEST</version>
<version>1.0.11</version>
</parent>

<artifactId>models</artifactId>

<name>models</name>
<version>1.0.6</version>
<url>http://maven.apache.org</url>

<properties>
Expand Down
3 changes: 1 addition & 2 deletions notifications/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
<parent>
<artifactId>homedash</artifactId>
<groupId>com.ftpix.homedash</groupId>
<version>LATEST</version>
<version>1.0.11</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>notifications</artifactId>
<packaging>jar</packaging>

<name>notifications</name>
<version>1.0.6</version>
<url>http://maven.apache.org</url>

<properties>
Expand Down
3 changes: 1 addition & 2 deletions plugins/couchpotato/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
<parent>
<groupId>com.ftpix.homedash.plugins</groupId>
<artifactId>plugins</artifactId>
<version>LATEST</version>
<version>1.0.11</version>
</parent>

<artifactId>couchpotato</artifactId>
<name>couchpotato</name>
<version>1.0.6</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
3 changes: 1 addition & 2 deletions plugins/docker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@
<parent>
<groupId>com.ftpix.homedash.plugins</groupId>
<artifactId>plugins</artifactId>
<version>LATEST</version>
<version>1.0.11</version>
</parent>

<artifactId>docker</artifactId>
<name>docker</name>
<url>http://maven.apache.org</url>
<version>1.0.7</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 29 additions & 18 deletions plugins/docker/src/main/java/assets/js/docker.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,27 +71,27 @@ function docker(moduleId) {
html.push(this.infoPanel('Restart policy', data.hostConfig.restartPolicy.name));
}

if(data.networkSettings.networks !== undefined){
if (data.networkSettings.networks !== undefined) {
var network = [];
$.each(data.networkSettings.networks, function(index, value){
network.push('<h4>', index,'</h4>');
$.each(data.networkSettings.networks, function (index, value) {
network.push('<h4>', index, '</h4>');

if(value.aliases !== undefined){
network.push('<p><strong>Aliases: </strong>',value.aliases.join(', '),'</p>');
if (value.aliases !== undefined) {
network.push('<p><strong>Aliases: </strong>', value.aliases.join(', '), '</p>');
}

if(value.gateway.length > 0){
network.push('<p><strong>Gateway: </strong>',value.gateway,'</p>');
if (value.gateway.length > 0) {
network.push('<p><strong>Gateway: </strong>', value.gateway, '</p>');
}

if(value.ipAddress.length > 0){
network.push('<p><strong>IP Address: </strong>',value.ipAddress,'</p>');
if (value.ipAddress.length > 0) {
network.push('<p><strong>IP Address: </strong>', value.ipAddress, '</p>');
}

if(value.macAddress.length > 0){
network.push('<p><strong>MAC Adress: </strong>',value.macAddress,'</p>');
if (value.macAddress.length > 0) {
network.push('<p><strong>MAC Adress: </strong>', value.macAddress, '</p>');
}
network.push('<p>','</p>');
network.push('<p>', '</p>');
network.push('<hr />')
});

Expand All @@ -105,12 +105,12 @@ function docker(moduleId) {
console.log('Port:', value);
network.push('<p>');
network.push(value[0].hostPort,
' <i class="fa fa-arrow-right" aria-hidden="true"></i> ', index);
' <i class="fa fa-arrow-right" aria-hidden="true"></i> ', index);
network.push('</p>');
}
});

if(network.length>0) {
if (network.length > 0) {
html.push(this.infoPanel('Ports', network.join('')));
}
}
Expand All @@ -120,12 +120,23 @@ function docker(moduleId) {
$.each(data.mounts, function (index, value) {
mounts.push('<p>');
mounts.push(value.source, ' <i class="fa fa-arrow-right" aria-hidden="true"></i> ',
value.destination, ':', value.mode);
value.destination, ':', value.mode);
mounts.push('</p>');
});

html.push(this.infoPanel("Mounts", mounts.join('')));

console.log('ENV', data.config.env)
if (data.config.env !== undefined && data.config.env.length > 0) {
var env = [];
$.each(data.config.env, function (index, value) {
var split = value.split('\u003d');
env.push('<p><strong>', split[0], ': </strong>', split[1], '</p>');
});

html.push(this.infoPanel('Environment variables', env.join('')));
}

root.find('.modal .container-info').html(html.join(''));
};

Expand Down Expand Up @@ -156,9 +167,9 @@ function docker(moduleId) {
html.push('<td class="status">', container.status, '</td>');
html.push('<td>', container.memoryUsagePretty, '</td>');
html.push('<td class="container-modal" data-id="', container.id, '", data-name="',
container.names.join(','), '">',
'<i class="fa fa-ellipsis-v" aria-hidden="true"></i>',
'</td>');
container.names.join(','), '">',
'<i class="fa fa-ellipsis-v" aria-hidden="true"></i>',
'</td>');

html.push('</tr>');
});
Expand Down
3 changes: 1 addition & 2 deletions plugins/dynamicdns/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
<parent>
<groupId>com.ftpix.homedash.plugins</groupId>
<artifactId>plugins</artifactId>
<version>1.0.6</version>
<version>1.0.11</version>
</parent>

<artifactId>dynamicdns</artifactId>
<name>dynamicdns</name>
<version>1.0.7</version>

<url>http://maven.apache.org</url>
<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@ private Ip getIpFromWeb() throws UnirestException {

Ip ip = new Ip();
ip.setAddress(ipFromWeb.getIp());
ip.setDate(new Date());
ip.setMethod("ipify.com");
return ip;
}
Expand Down
3 changes: 1 addition & 2 deletions plugins/googlepubliccalendar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
<parent>
<groupId>com.ftpix.homedash.plugins</groupId>
<artifactId>plugins</artifactId>
<version>LATEST</version> </parent>
<version>1.0.11</version> </parent>

<artifactId>googlepubliccalendar</artifactId>
<name>googlepubliccalendar</name>
<version>1.0.6</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
3 changes: 1 addition & 2 deletions plugins/harddisk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
<parent>
<groupId>com.ftpix.homedash.plugins</groupId>
<artifactId>plugins</artifactId>
<version>LATEST</version>
<version>1.0.11</version>
</parent>

<artifactId>harddisk</artifactId>
<name>harddisk</name>
<version>1.0.6</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
3 changes: 1 addition & 2 deletions plugins/mma/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
<parent>
<groupId>com.ftpix.homedash.plugins</groupId>
<artifactId>plugins</artifactId>
<version>LATEST</version> </parent>
<version>1.0.11</version> </parent>

<artifactId>mma</artifactId>
<name>mma</name>
<version>1.0.6</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
3 changes: 1 addition & 2 deletions plugins/network-monitor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
<parent>
<groupId>com.ftpix.homedash.plugins</groupId>
<artifactId>plugins</artifactId>
<version>LATEST</version>
<version>1.0.11</version>
</parent>

<artifactId>networkmonitor</artifactId>
<name>networkmonitor</name>
<version>1.0.6</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
3 changes: 1 addition & 2 deletions plugins/pihole/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
<parent>
<groupId>com.ftpix.homedash.plugins</groupId>
<artifactId>plugins</artifactId>
<version>LATEST</version> </parent>
<version>1.0.11</version> </parent>

<artifactId>pihole</artifactId>
<name>pihole</name>
<version>1.0.6</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
7 changes: 3 additions & 4 deletions plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
<parent>
<artifactId>homedash</artifactId>
<groupId>com.ftpix.homedash</groupId>
<version>LATEST</version>
<version>1.0.11</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>com.ftpix.homedash.plugins</groupId>
<artifactId>plugins</artifactId>
<packaging>pom</packaging>
<version>1.0.6</version>
<modules>
<module>systeminfo</module>
<module>docker</module>
Expand All @@ -33,13 +32,13 @@
<dependency>
<groupId>com.ftpix.homedash</groupId>
<artifactId>models</artifactId>
<version>1.0.6</version>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.ftpix.homedash</groupId>
<artifactId>notifications</artifactId>
<version>1.0.6</version>
<version>${project.version}</version>
</dependency>

</dependencies>
Expand Down
3 changes: 1 addition & 2 deletions plugins/portmapper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
<parent>
<groupId>com.ftpix.homedash.plugins</groupId>
<artifactId>plugins</artifactId>
<version>LATEST</version> </parent>
<version>1.0.11</version> </parent>

<artifactId>portmapper</artifactId>
<name>portmapper</name>
<version>1.0.6</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
4 changes: 2 additions & 2 deletions plugins/sonarrtv/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<groupId>com.ftpix.homedash.plugins</groupId>
<artifactId>plugins</artifactId>
<version>LATEST</version> </parent>
<version>1.0.11</version>
</parent>

<artifactId>sonarrtv</artifactId>
<name>sonarrtv</name>
<version>1.0.6</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
3 changes: 1 addition & 2 deletions plugins/systeminfo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
<parent>
<groupId>com.ftpix.homedash.plugins</groupId>
<artifactId>plugins</artifactId>
<version>LATEST</version>
<version>1.0.11</version>
</parent>

<artifactId>systeminfo</artifactId>
<name>systeminfo</name>
<version>1.0.6</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
3 changes: 1 addition & 2 deletions plugins/transmission/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
<parent>
<groupId>com.ftpix.homedash.plugins</groupId>
<artifactId>plugins</artifactId>
<version>LATEST</version> </parent>
<version>1.0.11</version> </parent>

<artifactId>transmission</artifactId>
<name>transmission</name>
<version>1.0.6</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
11 changes: 10 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.ftpix.homedash</groupId>
<artifactId>homedash</artifactId>
<version>1.0.6</version>
<version>1.0.11</version>
<name>Archetype - homedash</name>
<url>http://maven.apache.org</url>
<packaging>pom</packaging>
Expand Down Expand Up @@ -36,6 +36,15 @@
</pluginRepository>

</pluginRepositories>

<!-- https://mvnrepository.com/artifact/org.codehaus.mojo/versions-maven-plugin -->
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.3</version>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
Expand Down
3 changes: 1 addition & 2 deletions updater/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
<parent>
<artifactId>homedash</artifactId>
<groupId>com.ftpix.homedash</groupId>
<version>LATEST</version>
<version>1.0.11</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>updater</artifactId>
<version>1.0.9</version>
<dependencies>

<dependency>
Expand Down
Loading

0 comments on commit 5cc0757

Please sign in to comment.