refactor(all): update hardcoded internal domain to ansible variable
This commit is contained in:
@@ -149,8 +149,8 @@
|
|||||||
loop:
|
loop:
|
||||||
- image: "docker.io/library/redis:{{ version['containers']['redis'] }}"
|
- image: "docker.io/library/redis:{{ version['containers']['redis'] }}"
|
||||||
file: "docker.io_library_redis_{{ version['containers']['redis'] }}"
|
file: "docker.io_library_redis_{{ version['containers']['redis'] }}"
|
||||||
- image: "ilnmors.internal/{{ node['name'] }}/paperless-ngx:{{ version['containers']['paperless'] }}"
|
- image: "{{ domain['internal'] }}/{{ node['name'] }}/paperless-ngx:{{ version['containers']['paperless'] }}"
|
||||||
file: "ilnmors.internal_{{ node['name'] }}_paperless-ngx_{{ version['containers']['paperless'] }}"
|
file: "{{ domain['internal'] }}_{{ node['name'] }}_paperless-ngx_{{ version['containers']['paperless'] }}"
|
||||||
loop_control:
|
loop_control:
|
||||||
label: "{{ item.file }}"
|
label: "{{ item.file }}"
|
||||||
register: container_archive_images
|
register: container_archive_images
|
||||||
|
|||||||
@@ -100,20 +100,20 @@
|
|||||||
|
|
||||||
- name: Check container archive images
|
- name: Check container archive images
|
||||||
ansible.builtin.stat:
|
ansible.builtin.stat:
|
||||||
path: "{{ node['home_path'] }}/archives/containers/ilnmors.internal_{{ node['name'] }}_caddy_{{ version['containers']['caddy'] }}.tar"
|
path: "{{ node['home_path'] }}/archives/containers/{{ domain['internal'] }}_{{ node['name'] }}_caddy_{{ version['containers']['caddy'] }}.tar"
|
||||||
register: container_archive_images
|
register: container_archive_images
|
||||||
|
|
||||||
- name: Save container archive images
|
- name: Save container archive images
|
||||||
containers.podman.podman_save:
|
containers.podman.podman_save:
|
||||||
image:
|
image:
|
||||||
- "ilnmors.internal/{{ node['name'] }}/caddy:{{ version['containers']['caddy'] }}"
|
- "{{ domain['internal'] }}/{{ node['name'] }}/caddy:{{ version['containers']['caddy'] }}"
|
||||||
dest: "{{ node['home_path'] }}/archives/containers/ilnmors.internal_{{ node['name'] }}_caddy_{{ version['containers']['caddy'] }}.tar"
|
dest: "{{ node['home_path'] }}/archives/containers/{{ domain['internal'] }}_{{ node['name'] }}_caddy_{{ version['containers']['caddy'] }}.tar"
|
||||||
format: "oci-archive"
|
format: "oci-archive"
|
||||||
force: false
|
force: false
|
||||||
when: not container_archive_images.stat.exists
|
when: not container_archive_images.stat.exists
|
||||||
|
|
||||||
- name: Fetch container archive images
|
- name: Fetch container archive images
|
||||||
ansible.builtin.fetch:
|
ansible.builtin.fetch:
|
||||||
src: "{{ node['home_path'] }}/archives/containers/ilnmors.internal_{{ node['name'] }}_caddy_{{ version['containers']['caddy'] }}.tar"
|
src: "{{ node['home_path'] }}/archives/containers/{{ domain['internal'] }}_{{ node['name'] }}_caddy_{{ version['containers']['caddy'] }}.tar"
|
||||||
dest: "{{ hostvars['console']['node']['data_path'] }}/images/containers/"
|
dest: "{{ hostvars['console']['node']['data_path'] }}/images/containers/"
|
||||||
flat: true
|
flat: true
|
||||||
|
|||||||
@@ -176,15 +176,17 @@
|
|||||||
- name: Check container archive images
|
- name: Check container archive images
|
||||||
ansible.builtin.stat:
|
ansible.builtin.stat:
|
||||||
path: "{{ node['home_path'] }}/archives/containers/\
|
path: "{{ node['home_path'] }}/archives/containers/\
|
||||||
ilnmors.internal_{{ node['name'] }}_postgres_pg{{ version['containers']['postgresql'] }}-vectorchord{{ version['containers']['vectorchord'] }}.tar"
|
{{ domain['internal'] }}_{{ node['name'] }}_postgres_\
|
||||||
|
pg{{ version['containers']['postgresql'] }}-vectorchord{{ version['containers']['vectorchord'] }}.tar"
|
||||||
register: container_archive_images
|
register: container_archive_images
|
||||||
|
|
||||||
- name: Save container archive images
|
- name: Save container archive images
|
||||||
containers.podman.podman_save:
|
containers.podman.podman_save:
|
||||||
image:
|
image:
|
||||||
- "ilnmors.internal/{{ node['name'] }}/postgres:pg{{ version['containers']['postgresql'] }}-vectorchord{{ version['containers']['vectorchord'] }}"
|
- "{{ domain['internal'] }}/{{ node['name'] }}/postgres:pg{{ version['containers']['postgresql'] }}-vectorchord{{ version['containers']['vectorchord'] }}"
|
||||||
dest: "{{ node['home_path'] }}/archives/containers/\
|
dest: "{{ node['home_path'] }}/archives/containers/\
|
||||||
ilnmors.internal_{{ node['name'] }}_postgres_pg{{ version['containers']['postgresql'] }}-vectorchord{{ version['containers']['vectorchord'] }}.tar"
|
{{ domain['internal'] }}_{{ node['name'] }}_postgres_\
|
||||||
|
pg{{ version['containers']['postgresql'] }}-vectorchord{{ version['containers']['vectorchord'] }}.tar"
|
||||||
format: "oci-archive"
|
format: "oci-archive"
|
||||||
force: false
|
force: false
|
||||||
when: not container_archive_images.stat.exists
|
when: not container_archive_images.stat.exists
|
||||||
@@ -192,6 +194,7 @@
|
|||||||
- name: Fetch container archive images
|
- name: Fetch container archive images
|
||||||
ansible.builtin.fetch:
|
ansible.builtin.fetch:
|
||||||
src: "{{ node['home_path'] }}/archives/containers/\
|
src: "{{ node['home_path'] }}/archives/containers/\
|
||||||
ilnmors.internal_{{ node['name'] }}_postgres_pg{{ version['containers']['postgresql'] }}-vectorchord{{ version['containers']['vectorchord'] }}.tar"
|
{{ domain['internal'] }}_{{ node['name'] }}_postgres_\
|
||||||
|
pg{{ version['containers']['postgresql'] }}-vectorchord{{ version['containers']['vectorchord'] }}.tar"
|
||||||
dest: "{{ hostvars['console']['node']['data_path'] }}/images/containers/"
|
dest: "{{ hostvars['console']['node']['data_path'] }}/images/containers/"
|
||||||
flat: true
|
flat: true
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ After=redis_paperless.service
|
|||||||
Wants=redis_paperless.service
|
Wants=redis_paperless.service
|
||||||
|
|
||||||
[Container]
|
[Container]
|
||||||
Image=ilnmors.internal/app/paperless-ngx:{{ version['containers']['paperless'] }}
|
Image={{ domain['internal'] }}/{{ node['name'] }}/paperless-ngx:{{ version['containers']['paperless'] }}
|
||||||
ContainerName=paperless
|
ContainerName=paperless
|
||||||
HostName=paperless
|
HostName=paperless
|
||||||
PublishPort={{ services['paperless']['ports']['http'] }}:8000/tcp
|
PublishPort={{ services['paperless']['ports']['http'] }}:8000/tcp
|
||||||
|
|||||||
Reference in New Issue
Block a user