|
-
+
diff --git a/app/docker/filters/filters.js b/app/docker/filters/filters.js
index 3fd65f22a..46bdd65f0 100644
--- a/app/docker/filters/filters.js
+++ b/app/docker/filters/filters.js
@@ -248,6 +248,22 @@ angular.module('portainer.docker')
}).length;
};
})
+.filter('healthycontainers', function () {
+ 'use strict';
+ return function healthyContainersFilter(containers) {
+ return containers.filter(function (container) {
+ return container.Status === 'healthy';
+ }).length;
+ }
+})
+.filter('unhealthycontainers', function () {
+ 'use strict';
+ return function unhealthyContainersFilter(containers) {
+ return containers.filter(function (container) {
+ return container.Status === 'unhealthy';
+ }).length;
+ }
+})
.filter('imagestotalsize', function () {
'use strict';
return function (images) {
diff --git a/app/docker/models/config.js b/app/docker/models/config.js
index 56301040c..e9b2db69f 100644
--- a/app/docker/models/config.js
+++ b/app/docker/models/config.js
@@ -1,5 +1,11 @@
import { ResourceControlViewModel } from 'Portainer/models/resourceControl/resourceControl';
+function b64DecodeUnicode(str) {
+ return decodeURIComponent(atob(str).split('').map(function(c) {
+ return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+ }).join(''));
+}
+
export function ConfigViewModel(data) {
this.Id = data.ID;
this.CreatedAt = data.CreatedAt;
@@ -7,7 +13,7 @@ export function ConfigViewModel(data) {
this.Version = data.Version.Index;
this.Name = data.Spec.Name;
this.Labels = data.Spec.Labels;
- this.Data = atob(data.Spec.Data);
+ this.Data = b64DecodeUnicode(data.Spec.Data);
if (data.Portainer && data.Portainer.ResourceControl) {
this.ResourceControl = new ResourceControlViewModel(data.Portainer.ResourceControl);
diff --git a/app/docker/views/containers/create/createContainerController.js b/app/docker/views/containers/create/createContainerController.js
index 7c331b7e3..a1e2ce8c5 100644
--- a/app/docker/views/containers/create/createContainerController.js
+++ b/app/docker/views/containers/create/createContainerController.js
@@ -21,6 +21,8 @@ function ($q, $scope, $async, $state, $timeout, $transition$, $filter, Container
MacAddress: '',
IPv4: '',
IPv6: '',
+ DnsPrimary: '',
+ DnsSecondary: '',
AccessControlData: new AccessControlFormData(),
CpuLimit: 0,
MemoryLimit: 0,
@@ -202,19 +204,28 @@ function ($q, $scope, $async, $state, $timeout, $transition$, $filter, Container
}
config.HostConfig.NetworkMode = networkMode;
config.MacAddress = $scope.formValues.MacAddress;
-
+
config.NetworkingConfig.EndpointsConfig[networkMode] = {
IPAMConfig: {
IPv4Address: $scope.formValues.IPv4,
IPv6Address: $scope.formValues.IPv6
}
};
-
+
if (networkMode && _.get($scope.config.NetworkingConfig.EndpointsConfig[networkMode], 'Aliases')){
var aliases = $scope.config.NetworkingConfig.EndpointsConfig[networkMode].Aliases;
config.NetworkingConfig.EndpointsConfig[networkMode].Aliases = _.filter(aliases, (o) => { return !_.startsWith($scope.fromContainer.Id,o)});
}
+ var dnsServers = [];
+ if ($scope.formValues.DnsPrimary) {
+ dnsServers.push($scope.formValues.DnsPrimary);
+ }
+ if ($scope.formValues.DnsSecondary) {
+ dnsServers.push($scope.formValues.DnsSecondary);
+ }
+ config.HostConfig.Dns = dnsServers;
+
$scope.formValues.ExtraHosts.forEach(function (v) {
if (v.value) {
config.HostConfig.ExtraHosts.push(v.value);
@@ -312,7 +323,7 @@ function ($q, $scope, $async, $state, $timeout, $transition$, $filter, Container
return config;
}
-
+
function loadFromContainerCmd() {
if ($scope.config.Cmd) {
$scope.config.Cmd = ContainerHelper.commandArrayToString($scope.config.Cmd);
@@ -387,6 +398,13 @@ function ($q, $scope, $async, $state, $timeout, $transition$, $filter, Container
}
$scope.formValues.MacAddress = d.Config.MacAddress;
+ if (d.HostConfig.Dns && d.HostConfig.Dns[0]) {
+ $scope.formValues.DnsPrimary = d.HostConfig.Dns[0];
+ if (d.HostConfig.Dns[1]) {
+ $scope.formValues.DnsSecondary = d.HostConfig.Dns[1];
+ }
+ }
+
// ExtraHosts
if ($scope.config.HostConfig.ExtraHosts) {
var extraHosts = $scope.config.HostConfig.ExtraHosts;
diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html
index 266f6d0d7..130c75307 100644
--- a/app/docker/views/containers/create/createcontainer.html
+++ b/app/docker/views/containers/create/createcontainer.html
@@ -435,6 +435,22 @@
+
+
+
+
+
+
|