* add acs-engine mirror sites

* fix deploy docker registry command sample

* short arm template resource name

* change arm template resource name prefix to resource group id

* rollback arm template resoure prefix to resource group name except storage accounts

* change arm template resource name prefix to resource group id unique string

* fix private registry invalid secret issue
This commit is contained in:
Pengzhi Sun 2017-11-10 16:30:21 +08:00 коммит произвёл GitHub
Родитель e4adbc57f8
Коммит 312cc2d35f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 2 добавлений и 4 удалений

Просмотреть файл

@ -58,7 +58,6 @@ To be more secure than plain HTTP solution, you can [deploy with a self-signed c
```
- REGISTRY_HTTP_TLS_CERTIFICATE=/certs/server.crt
- REGISTRY_HTTP_TLS_KEY=/certs/server.key
- REGISTRY_HTTP_SECRET="<<<variables('httpSecretString')>>>"
```
3. Edit azuredeploy.parameters.json, and run command below
```

Просмотреть файл

@ -58,7 +58,6 @@ $ bash ./deploy-docker-registry.sh -n <resource_group_name> -l <location> -m mir
```
- REGISTRY_HTTP_TLS_CERTIFICATE=/certs/server.crt
- REGISTRY_HTTP_TLS_KEY=/certs/server.key
- REGISTRY_HTTP_SECRET="<<<variables('httpSecretString')>>>"
```
3. 编辑azuredeploy.parameters.json中的参数运行命令
```

Просмотреть файл

@ -9,7 +9,7 @@ packages:
runcmd:
- apt-get update
- apt-get install -y apt-transport-https ca-certificates
- for i in 1 2 3 4 5; do curl --max-time 60 -fsSL https://apt.dockerproject.org/gpg | apt-key add -; [ $? -eq 0 ] && break || sleep 5; done
- for i in 1 2 3 4 5; do curl --max-time 60 -fsSL https://aptdocker.azureedge.net/gpg | apt-key add -; [ $? -eq 0 ] && break || sleep 5; done
- echo "deb https://{{{azureMirror}}}/docker-engine/apt/repo/ ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list
- apt-get update
- apt-get install -y docker-engine
@ -49,7 +49,7 @@ write_files:
environment:
#- REGISTRY_HTTP_TLS_CERTIFICATE=/certs/server.crt
#- REGISTRY_HTTP_TLS_KEY=/certs/server.key
#- REGISTRY_HTTP_SECRET="<<<variables('httpSecretString')>>>"
- REGISTRY_HTTP_SECRET="<<<variables('httpSecretString')>>>"
- REGISTRY_STORAGE=azure
- REGISTRY_STORAGE_AZURE_ACCOUNTNAME="<<<variables('registryStorageAccountName')>>>"
- REGISTRY_STORAGE_AZURE_ACCOUNTKEY="<<<listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('registryStorageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).keys[0].value>>>"