github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(docker): Restrict registry edit options for different registry type EE-2705 (#6708) 

* EE-2705 restrict registry edit options for different registry type

* EE-2705 quay and azure registry should not disable authentication

* EE-2705 Resolve conflict
pull/6951/head
Chao Geng 2022-05-18 18:46:24 +08:00 committed by GitHub
parent 1132c9ce87
commit 9a48ceaec1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/portainer/views/registries/edit/registry.html
View File

@ -26,7 +26,7 @@
</div> </div>
<!-- !name-input --> <!-- !name-input -->
<!-- registry-url-input --> <!-- registry-url-input -->
<div class="form-group"> <div class="form-group" ng-if="registry.Type !== RegistryTypes.DOCKERHUB && registry.Type !== RegistryTypes.QUAY && registry.Type !== RegistryTypes.GITLAB">
<label for="registry_url" class="col-sm-3 col-lg-2 control-label text-left"> <label for="registry_url" class="col-sm-3 col-lg-2 control-label text-left">
Registry URL Registry URL
<portainer-tooltip position="bottom" message="URL or IP address of a Docker registry. Any protocol or trailing slash will be stripped if present."> <portainer-tooltip position="bottom" message="URL or IP address of a Docker registry. Any protocol or trailing slash will be stripped if present.">
@ -39,7 +39,15 @@
<!-- !registry-url-input --> <!-- !registry-url-input -->
<!-- authentication-checkbox --> <!-- authentication-checkbox -->
<div class="form-group" ng-if="$ctrl.registry.Type !== $ctrl.RegistryTypes.PROGET"> <div
class="form-group"
ng-if="
$ctrl.registry.Type !== $ctrl.RegistryTypes.DOCKERHUB &&
$ctrl.registry.Type !== $ctrl.RegistryTypes.QUAY &&
$ctrl.registry.Type !== $ctrl.RegistryTypes.PROGET &&
$ctrl.registry.Type !== $ctrl.RegistryTypes.AZURE
"
>
<div class="col-sm-12"> <div class="col-sm-12">
<label for="registry_auth" class="control-label text-left"> <label for="registry_auth" class="control-label text-left">
Authentication Authentication