Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 22:05:23 +02:00
Code Issues Releases Activity

fix(docker): remove prepended slash by default on container names [EE-3592] (#8195)

Browse source 
* remove prepended slash by default if present

* trimcontainername still needed
This commit is contained in:
Matt Hook 2023-02-09 17:18:19 +13:00 • committed by GitHub
parent bfc610c192
commit f9bbe000fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/docker/filters/filters.js
View file

@ -114,7 +114,7 @@ angular
'use strict';
return function (name) {
if (name) {
return name.indexOf('/') === 0 ? name.replace('/', '') : name;
return name.indexOf('/') === 0 ? name.slice(1) : name;
}
return '';
};
@ -161,8 +161,7 @@ angular
.filter('containername', function () {
'use strict';
return function (container) {
var name = container.Names[0];
return name.substring(1, name.length);
return container.Names[0];
};
})
.filter('swarmversion', function () {
@ -174,7 +173,7 @@ angular
.filter('swarmhostname', function () {
'use strict';
return function (container) {
return _.split(container.Names[0], '/')[1];
return container.Names[0];
};
})
.filter('repotags', function () {

6
app/docker/views/containers/create/createContainerController.js
View file

@ -338,7 +338,7 @@ angular.module('portainer.docker').controller('CreateContainerController', [
var container = $scope.formValues.NetworkContainer;
var containerName = container;
if (container && typeof container === 'object') {
containerName = $filter('trimcontainername')(container.Names[0]);
containerName = container.Names[0];
}
var networkMode = mode;
if (containerName) {
@ -987,7 +987,7 @@ angular.module('portainer.docker').controller('CreateContainerController', [
if (!oldContainer) {
return;
}
return ContainerService.renameContainer(oldContainer.Id, oldContainer.Names[0].substring(1));
return ContainerService.renameContainer(oldContainer.Id, oldContainer.Names[0]);
}
function confirmCreateContainer(container) {
@ -1033,7 +1033,7 @@ angular.module('portainer.docker').controller('CreateContainerController', [
}
function renameContainer() {
return ContainerService.renameContainer(oldContainer.Id, oldContainer.Names[0].substring(1) + '-old');
return ContainerService.renameContainer(oldContainer.Id, oldContainer.Names[0] + '-old');
}
function pullImageIfNeeded() {