Compare commits
4 Commits
8a3d588a66
...
513392180a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
513392180a | ||
|
|
a1c23a5f1f | ||
|
|
202046f442 | ||
|
|
13f81e0c3e |
@@ -29,13 +29,27 @@
|
||||
|
||||
- name: Set container_image variable
|
||||
set_fact:
|
||||
container_image: "{{ item }}"
|
||||
container_image: "{{ item.image }}"
|
||||
when: item.skipped is not defined or not item.skipped
|
||||
loop:
|
||||
- "{{ built_image }}"
|
||||
- "{{ pulled_image }}"
|
||||
|
||||
- name: Check mode image info
|
||||
when: ansible_check_mode
|
||||
block:
|
||||
- name: Get docker image info for check mode
|
||||
docker_image_info:
|
||||
name: "{{ ('local_' + docker_service) if dockerfile is defined and dockerfile | length > 0 else docker_image }}"
|
||||
register: existing_image
|
||||
|
||||
- name: Set check nmode container_image variable
|
||||
set_fact:
|
||||
container_image: "{{ existing_image.images[0] }}"
|
||||
|
||||
- name: Set image user variable
|
||||
set_fact:
|
||||
image_user: "{{ container_image.image.Config.User }}"
|
||||
when: container_image.image.Config.User | length > 0
|
||||
image_user: "{{ container_image.Config.User }}"
|
||||
when:
|
||||
- not ansible_check_mode
|
||||
- container_image.Config.User | length > 0
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
- name: "Container for {{ docker_service_name }}"
|
||||
docker_container:
|
||||
name: "{{ docker_service_name }}"
|
||||
image: "{{ container_image.image.Id }}"
|
||||
image: "{{ container_image.Id }}"
|
||||
user: "{{ docker_user if docker_host_user else omit }}"
|
||||
mounts: "{{ docker_volume_definition }}"
|
||||
published_ports: "{{ container_published_ports + docker_published_ports }}"
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
|
||||
traefik_labels:
|
||||
traefik.enable: 'true'
|
||||
"traefik.http.routers.{{ docker_service }}.rule": "Host(`{{ vhost_domains[docker_service] | join('`) || Host(`') }}`)"
|
||||
"traefik.http.routers.{{ docker_service }}.tls.certresolver": 'le'
|
||||
"traefik.http.routers.{{ docker_service_name }}.rule": "Host(`{{ vhost_domains[docker_service_name] | join('`) || Host(`') }}`)"
|
||||
"traefik.http.routers.{{ docker_service_name }}.tls.certresolver": 'le'
|
||||
|
||||
@@ -9,6 +9,14 @@
|
||||
jitsi_web_published_ports: ["127.0.0.1:{{ ports.jitsi_http }}:80"]
|
||||
when: reverse_proxy_type != 'traefik'
|
||||
|
||||
- name: Reset jitsi meet prosody published ports variable
|
||||
set_fact:
|
||||
jitsi_prosody_published_ports: []
|
||||
- name: Set jitsi meet prosody published ports variable
|
||||
set_fact:
|
||||
jitsi_prosody_published_ports: ["127.0.0.1:{{ ports.jitsi_prosody_http }}:5280"]
|
||||
when: ports.jitsi_prosody_http is defined
|
||||
|
||||
- name: Include traefik vars
|
||||
include_vars: traefik.yml
|
||||
when: reverse_proxy_type == 'traefik'
|
||||
@@ -47,6 +55,7 @@
|
||||
image: "jitsi/prosody:{{ jitsi_docker_tag }}"
|
||||
pull: true
|
||||
container_default_behavior: no_defaults
|
||||
published_ports: "{{ jitsi_prosody_published_ports }}"
|
||||
env:
|
||||
PUBLIC_URL: "https://{{ jitsi_domain }}"
|
||||
TZ: "{{ timezone }}"
|
||||
@@ -65,6 +74,7 @@
|
||||
XMPP_AUTH_DOMAIN: auth.meet.jitsi
|
||||
XMPP_INTERNAL_MUC_DOMAIN: internal-muc.meet.jitsi
|
||||
XMPP_MUC_DOMAIN: muc.meet.jitsi
|
||||
XMPP_MODULES: 'muc_census'
|
||||
restart_policy: always
|
||||
exposed_ports:
|
||||
- '5222'
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
wordpress_tag: php8.1
|
||||
|
||||
dockerfile: {}
|
||||
docker_additional_services: []
|
||||
|
||||
docker_host_user: false
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
---
|
||||
|
||||
- name: Reset dockerfile variable
|
||||
set_fact:
|
||||
dockerfile: {}
|
||||
|
||||
- name: Add memcached php extension to container
|
||||
set_fact:
|
||||
dockerfile: "{{ dockerfile | combine({'run': \
|
||||
|
||||
Reference in New Issue
Block a user