diff --git a/is-registry/defaults/main.yml b/is-registry/defaults/main.yml index 6e8650f..02b27fc 100644 --- a/is-registry/defaults/main.yml +++ b/is-registry/defaults/main.yml @@ -4,10 +4,11 @@ start_scopes: 'devNext' infrastructure: 'gcube' complete_start_scope: '/gcube/devNext' gcore_host: 'node14-d-d4s.d4science.org' +config_dir: 'etc/is-registry-service' is_registry_compose_dir: '/srv/is-registry_stack' is_registry_docker_stack_name: 'is-registry-stack' is_registry_docker_service_server_name: 'is-registry' -is_registry_docker_server_image: 'd4science/gcore-is-registry' +is_registry_docker_server_image: 'd4science/gcore-is-registry:latest' is_registry_docker_network: 'is-registry-network' is_registry_service_port: 8080 is_registry_haproxy_public_net: 'haproxy-public' \ No newline at end of file diff --git a/is-registry/handlers/main.yml b/is-registry/handlers/main.yml deleted file mode 100644 index e19f281..0000000 --- a/is-registry/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for is-registry diff --git a/is-registry/meta/main.yml b/is-registry/meta/main.yml index ca196b0..307f012 100644 --- a/is-registry/meta/main.yml +++ b/is-registry/meta/main.yml @@ -47,9 +47,9 @@ galaxy_info: # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. -dependencies: - - name: python3-environment - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-python3-environment.git - version: master - state: latest +dependencies: [] +# - name: python3-environment +# src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-python3-environment.git +# version: master +# state: latest diff --git a/is-registry/templates/docker-compose.yml.j2 b/is-registry/templates/docker-compose.yml.j2 index eb6e0b9..ee5a9d7 100644 --- a/is-registry/templates/docker-compose.yml.j2 +++ b/is-registry/templates/docker-compose.yml.j2 @@ -16,8 +16,8 @@ secrets: services: {{ is_registry_docker_service_server_name }}: image: {{ is_registry_docker_server_image }} - ports: - - "{{ is_registry_service_port }}:{{ is_registry_service_port }}" + #ports: + # - "{{ is_registry_service_port }}:{{ is_registry_service_port }}" networks: - {{ is_registry_docker_network }} - {{ is_registry_haproxy_public_net }} @@ -34,7 +34,7 @@ services: deploy: mode: replicated replicas: 1 - #endpoint_mode: dnsrr + endpoint_mode: dnsrr placement: constraints: [node.role == manager] restart_policy: @@ -42,5 +42,5 @@ services: delay: 5s max_attempts: 5 window: 120s - #logging: - # driver: 'journald' + logging: + driver: 'journald' diff --git a/is-registry/templates/jndi-config.xml.j2 b/is-registry/templates/jndi-config.xml.j2 index 278ce4b..9280380 100644 --- a/is-registry/templates/jndi-config.xml.j2 +++ b/is-registry/templates/jndi-config.xml.j2 @@ -3,7 +3,7 @@ -