Skip to content

Commit ce95740

Browse files
committed
moved container registry to cesnet gitlab
1 parent 4fd83c8 commit ce95740

8 files changed

Lines changed: 16 additions & 13 deletions

File tree

defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,9 @@ perun_postgresql_version: 16
763763
# https://github.com/portainer/portainer/releases
764764
perun_portainer_version: latest
765765

766+
# prefix for containers
767+
perun_container_registry: "gitlab-registry.cesnet.cz/712/deployment/idm/perun_idm_docker"
768+
766769
# directory with SSL/TLS certificates and keys
767770
perun_certs_dir: "/etc/perun/ssl"
768771
perun_certificate_file: "{{ perun_certs_dir }}/hostcert.pem"

tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@
8383
vars:
8484
docker_packages_hold: true
8585
docker_registries:
86-
- url: registry.gitlab.ics.muni.cz:443
87-
username: gitlab-read-only-deploy-token-perun-all
88-
password: BgdJHJ_gsmyqp3se5WRx
86+
- url: gitlab-registry.cesnet.cz
87+
username: gitlab-deploy-token-712
88+
password: gldt-TcDbEs8Yj-cX4KPmM1Wq
8989
docker_local_network_name: perun_net
9090
docker_portainer_install: true
9191
docker_portainer_admin_password_file: "{{ perun_certs_dir }}/portainer_admin_password.txt"

tasks/perun_apache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@
417417
docker_container:
418418
name: perun_apache
419419
hostname: perun-apache
420-
image: "registry.gitlab.ics.muni.cz:443/perun/deployment/idm/perun_idm_docker/perun_apache:{{ perun_apache_container_version }}"
420+
image: "{{ perun_container_registry }}/perun_apache:{{ perun_apache_container_version }}"
421421
pull: yes
422422
state: started
423423
restart_policy: unless-stopped

tasks/perun_auditlogger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
docker_container:
112112
name: perun_auditlogger
113113
hostname: perun-auditlogger
114-
image: "registry.gitlab.ics.muni.cz:443/perun/deployment/idm/perun_idm_docker/perun_auditlogger:{{ perun_auditlogger_container_version }}"
114+
image: "{{ perun_container_registry }}/perun_auditlogger:{{ perun_auditlogger_container_version }}"
115115
pull: yes
116116
restart_policy: unless-stopped
117117
mounts:

tasks/perun_cli.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
--add-host {{ host }}:{{ ip }} \
2525
{% endfor %}
2626
--env-file /etc/perun/perun-cli-env -w $PWD ${PERUN_DOCKER_OPTS} \
27-
registry.gitlab.ics.muni.cz:443/perun/deployment/idm/perun_idm_docker/perun_cli_perl:{{ perun_cli_container_version }} "$ARGS"
27+
{{ perun_container_registry }}/perun_cli_perl:{{ perun_cli_container_version }} "$ARGS"
2828
2929
- name: "create /usr/local/bin/perun-script-cli for scripts"
3030
copy:
@@ -41,7 +41,7 @@
4141
--add-host {{ host }}:{{ ip }} \
4242
{% endfor %}
4343
--env-file /etc/perun/perun-cli-env --entrypoint="" ${PERUN_DOCKER_OPTS} \
44-
registry.gitlab.ics.muni.cz:443/perun/deployment/idm/perun_idm_docker/perun_cli_perl:{{ perun_cli_container_version }} "$@"
44+
{{ perun_container_registry }}/perun_cli_perl:{{ perun_cli_container_version }} "$@"
4545
4646
- name: "prune unused docker images other than CLI"
4747
docker_prune:
@@ -57,7 +57,7 @@
5757

5858
- name: "preload image for perun_cli"
5959
docker_image:
60-
name: "registry.gitlab.ics.muni.cz:443/perun/deployment/idm/perun_idm_docker/perun_cli_perl:{{ perun_cli_container_version }}"
60+
name: "{{ perun_container_registry }}/perun_cli_perl:{{ perun_cli_container_version }}"
6161
source: pull
6262
force_source: true
6363
state: present
@@ -70,7 +70,7 @@
7070
- "images"
7171
- "-q"
7272
- "--filter"
73-
- "before=registry.gitlab.ics.muni.cz:443/perun/deployment/idm/perun_idm_docker/perun_cli_perl:{{ perun_cli_container_version }}"
73+
- "before={{ perun_container_registry }}/perun_cli_perl:{{ perun_cli_container_version }}"
7474
- "--filter"
7575
- "label=org.perun-aai.cli"
7676
register: oldcliimages

tasks/perun_engine.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@
320320
docker_container:
321321
name: perun_engine
322322
hostname: perun-engine
323-
image: "registry.gitlab.ics.muni.cz:443/perun/deployment/idm/perun_idm_docker/perun_engine:{{ perun_engine_container_version }}"
323+
image: "{{ perun_container_registry }}/perun_engine:{{ perun_engine_container_version }}"
324324
pull: yes
325325
restart_policy: unless-stopped
326326
mounts: "{{ engine_mounts}}"
@@ -365,5 +365,5 @@
365365
--add-host {{ host }}:{{ ip }} \
366366
{% endfor %}
367367
-w /home/perun \
368-
registry.gitlab.ics.muni.cz:443/perun/deployment/idm/perun_idm_docker/perun_engine:{{ perun_engine_container_version }} /bin/bash --login
368+
{{ perun_container_registry }}/perun_engine:{{ perun_engine_container_version }} /bin/bash --login
369369

tasks/perun_ldapc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
docker_container:
109109
name: perun_ldapc
110110
hostname: perun-ldapc
111-
image: "registry.gitlab.ics.muni.cz:443/perun/deployment/idm/perun_idm_docker/perun_ldapc:{{ perun_ldapc_container_version }}"
111+
image: "{{ perun_container_registry }}/perun_ldapc:{{ perun_ldapc_container_version }}"
112112
pull: yes
113113
restart_policy: unless-stopped
114114
mounts:

tasks/perun_rpc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245
docker_container:
246246
name: perun_rpc
247247
hostname: perun-rpc
248-
image: "registry.gitlab.ics.muni.cz:443/perun/deployment/idm/perun_idm_docker/perun_rpc:{{ perun_rpc_container_version }}"
248+
image: "{{ perun_container_registry }}/perun_rpc:{{ perun_rpc_container_version }}"
249249
pull: yes
250250
state: started
251251
restart_policy: unless-stopped

0 commit comments

Comments
 (0)