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

feat(image): upload local files for building image EE-3021 (#7507)

Browse source 
* support to make multiple files in archive buffer

* upload files by multipart
This commit is contained in:
Chao Geng 2022-09-14 14:47:24 +08:00 • committed by GitHub
parent a7d458f0bd
commit d570aee554
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 171 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/docker/services/buildService.js
View file

@ -66,6 +66,24 @@ angular.module('portainer.docker').factory('BuildService', [
return deferred.promise;
};
service.buildImageFromDockerfileContentAndFiles = function (names, content, files) {
var dockerfile = new Blob([content], { type: 'text/plain' });
var uploadFiles = [dockerfile].concat(files);
var deferred = $q.defer();
FileUploadService.buildImageFromFiles(names, uploadFiles)
.then(function success(response) {
var model = new ImageBuildModel(response.data);
deferred.resolve(model);
})
.catch(function error(err) {
deferred.reject(err);
});
return deferred.promise;
};
return service;
},
]);

12
app/docker/views/images/build/buildImageController.js
View file

@ -13,6 +13,7 @@ function BuildImageController($scope, $async, $window, ModalService, BuildServic
ImageNames: [{ Name: '', Valid: false, Unique: true }],
UploadFile: null,
DockerFileContent: '',
AdditionalFiles: [],
URL: '',
Path: 'Dockerfile',
NodeName: null,
@ -74,7 +75,12 @@ function BuildImageController($scope, $async, $window, ModalService, BuildServic
return BuildService.buildImageFromURL(names, URL, dockerfilePath);
} else {
var dockerfileContent = $scope.formValues.DockerFileContent;
return BuildService.buildImageFromDockerfileContent(names, dockerfileContent);
if ($scope.formValues.AdditionalFiles.length === 0) {
return BuildService.buildImageFromDockerfileContent(names, dockerfileContent);
} else {
var additionalFiles = $scope.formValues.AdditionalFiles;
return BuildService.buildImageFromDockerfileContentAndFiles(names, dockerfileContent, additionalFiles);
}
}
}
@ -140,4 +146,8 @@ function BuildImageController($scope, $async, $window, ModalService, BuildServic
return ModalService.confirmWebEditorDiscard();
}
};
$scope.selectAdditionalFiles = function (files) {
$scope.formValues.AdditionalFiles = files;
};
}

14
app/docker/views/images/build/buildimage.html
View file

@ -132,6 +132,20 @@
></code-editor>
</div>
</div>
<div class="col-sm-12 form-section-title"> Upload </div>
<div class="form-group">
<div class="col-sm-12">
<div class="form-group">
<span class="col-sm-12 text-muted small">
You can upload files from your local computer for referencing in your Dockerfile (using ADD filename) so they are included in your built image.
</span>
</div>
<button class="btn btn-sm btn-primary" ngf-select="selectAdditionalFiles($files)" ngf-multiple="true">Select files</button>
<span ng-repeat="item in formValues.AdditionalFiles track by $index" class="mx-2">
{{ item.name }}
</span>
</div>
</div>
</div>
<!-- !web-editor -->
<!-- upload -->