From a12d77390a9b3f8339587881532e7333b4e997d1 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Thu, 24 Jun 2021 11:52:23 +0200 Subject: [PATCH] chore: use robot account for harbor --- group_vars/stage_dev/plain.yml | 2 ++ group_vars/stage_dev/vault.yml | 10 ++++++++++ roles/common/configs/docker/config.json.j2 | 7 ++----- 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 group_vars/stage_dev/vault.yml diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml index 0492b35..8dd794e 100644 --- a/group_vars/stage_dev/plain.yml +++ b/group_vars/stage_dev/plain.yml @@ -3,6 +3,8 @@ stage: "dev" docker_registry: dev-docker-registry-01.smardigo.digital +docker_registry_username: "< see vault >" +docker_registry_token: "< see vault >" alertmanager_channel_smardigo: "#monitoring-qa" diff --git a/group_vars/stage_dev/vault.yml b/group_vars/stage_dev/vault.yml new file mode 100644 index 0000000..16acc4e --- /dev/null +++ b/group_vars/stage_dev/vault.yml @@ -0,0 +1,10 @@ +$ANSIBLE_VAULT;1.1;AES256 +39313531633739326530626666386131353364613730656339343961343033343466356236666631 +3363306565313631366533643762626234393935616362300a376237613930383138613939656437 +33393730306335316163303863383230646337316432383431613133353735376330323563306434 +6239623063383465320a616562343839373538323330636235613733306331333963623131386534 +65613139366464306165313230373366346463623239343561653739326430373036313565623432 +64363237613666663433336466363864646263633735666563376138346263336433346265393435 +36376161633431343534373264363133363434633161343636383534356635666365306566626463 +63366461643533633562613063323335303437343138663061623933343264653439353637356631 +33646131643732303262363238386637666232356562363630616335323330653365 diff --git a/roles/common/configs/docker/config.json.j2 b/roles/common/configs/docker/config.json.j2 index d631aed..6c54bf7 100644 --- a/roles/common/configs/docker/config.json.j2 +++ b/roles/common/configs/docker/config.json.j2 @@ -1,10 +1,7 @@ { "auths": { - "dev-docker-registry-01.smardigo.digital": { - "auth": "ZG9ja2VyLWFkbWluOnlZVGRXY1ExS01UZWxsOEVOVHlEVjlkZWRRUWZVTg==" + "{{ docker_registry }}": { + "auth": "{{ [docker_registry_username, docker_registry_token] | join(":") | string | b64encode }}" } - }, - "HttpHeaders": { - "User-Agent": "Docker-Client/19.03.13 (linux)" } } \ No newline at end of file