Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-21 14:29:40 +02:00
Code Issues Releases Activity

fix(global): remove automatic lowercase processing on image names (#442)

Browse source
This commit is contained in:
Anthony Lapenna 2016-12-31 13:25:42 +13:00 • committed by GitHub
parent 4b747a78cd
commit 907f83aaff
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/components/container/containerController.js
View file

@ -75,8 +75,8 @@ function ($scope, $state, $stateParams, $filter, Container, ContainerCommit, Ima
$scope.commit = function () { $scope.commit = function () {
$('#createImageSpinner').show(); $('#createImageSpinner').show();
var image = _.toLower($scope.config.Image); var image = $scope.config.Image;
var registry = _.toLower($scope.config.Registry); var registry = $scope.config.Registry;
var imageConfig = ImageHelper.createImageConfigForCommit(image, registry); var imageConfig = ImageHelper.createImageConfigForCommit(image, registry);
ContainerCommit.commit({id: $stateParams.id, tag: imageConfig.tag, repo: imageConfig.repo}, function (d) { ContainerCommit.commit({id: $stateParams.id, tag: imageConfig.tag, repo: imageConfig.repo}, function (d) {
$('#createImageSpinner').hide(); $('#createImageSpinner').hide();

2
app/components/createContainer/createContainerController.js
View file

@ -141,7 +141,7 @@ function ($scope, $state, $stateParams, $filter, Config, Info, Container, Contai
} }
function prepareImageConfig(config) { function prepareImageConfig(config) {
var image = _.toLower(config.Image); var image = config.Image;
var registry = $scope.formValues.Registry; var registry = $scope.formValues.Registry;
var imageConfig = ImageHelper.createImageConfigForContainer(image, registry); var imageConfig = ImageHelper.createImageConfigForContainer(image, registry);
config.Image = imageConfig.fromImage + ':' + imageConfig.tag; config.Image = imageConfig.fromImage + ':' + imageConfig.tag;

4
app/components/image/imageController.js
View file

@ -21,8 +21,8 @@ function ($scope, $stateParams, $state, Image, ImageHelper, Messages) {
$scope.tagImage = function() { $scope.tagImage = function() {
$('#loadingViewSpinner').show(); $('#loadingViewSpinner').show();
var image = _.toLower($scope.config.Image); var image = $scope.config.Image;
var registry = _.toLower($scope.config.Registry); var registry = $scope.config.Registry;
var imageConfig = ImageHelper.createImageConfigForCommit(image, registry); var imageConfig = ImageHelper.createImageConfigForCommit(image, registry);
Image.tag({id: $stateParams.id, tag: imageConfig.tag, repo: imageConfig.repo}, function (d) { Image.tag({id: $stateParams.id, tag: imageConfig.tag, repo: imageConfig.repo}, function (d) {
Messages.send('Image successfully tagged'); Messages.send('Image successfully tagged');

4
app/components/images/imagesController.js
View file

@ -27,8 +27,8 @@ function ($scope, $state, Config, Image, ImageHelper, Messages, Settings) {
$scope.pullImage = function() { $scope.pullImage = function() {
$('#pullImageSpinner').show(); $('#pullImageSpinner').show();
var image = _.toLower($scope.config.Image); var image = $scope.config.Image;
var registry = _.toLower($scope.config.Registry); var registry = $scope.config.Registry;
var imageConfig = ImageHelper.createImageConfigForContainer(image, registry); var imageConfig = ImageHelper.createImageConfigForContainer(image, registry);
Image.create(imageConfig, function (data) { Image.create(imageConfig, function (data) {
var err = data.length > 0 && data[data.length - 1].hasOwnProperty('error'); var err = data.length > 0 && data[data.length - 1].hasOwnProperty('error');

2
app/components/templates/templatesController.js
View file

@ -134,7 +134,7 @@ function ($scope, $q, $state, $filter, $anchorScroll, Config, Info, Container, C
} }
function prepareImageConfig(config, template) { function prepareImageConfig(config, template) {
var image = _.toLower(template.image); var image = template.image;
var registry = template.registry || ''; var registry = template.registry || '';
var imageConfig = ImageHelper.createImageConfigForContainer(image, registry); var imageConfig = ImageHelper.createImageConfigForContainer(image, registry);
config.Image = imageConfig.fromImage + ':' + imageConfig.tag; config.Image = imageConfig.fromImage + ':' + imageConfig.tag;