Compare commits

..

5 Commits

28 changed files with 33 additions and 53 deletions

View File

@ -1,6 +1,6 @@
- name: set service_name to the name of the current role - name: set service_name to cleanup-backups
set_fact: set_fact:
service_name: "{{ role_name }}" service_name: "cleanup-backups"
when: run_once_cleanup_backups_timer is not defined when: run_once_cleanup_backups_timer is not defined
- name: "include role for systemd-timer for {{service_name}}" - name: "include role for systemd-timer for {{service_name}}"

View File

@ -1,5 +1,3 @@
version: '3.7'
services: services:
{% include 'templates/docker/services/' + database_type + '.yml.j2' %} {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

View File

@ -1,4 +1,3 @@
version: '3.2'
services: services:
{% include 'templates/docker/services/redis.yml.j2' %} {% include 'templates/docker/services/redis.yml.j2' %}

View File

@ -1,5 +1,3 @@
version: '2'
services: services:
{% include 'templates/docker/services/redis.yml.j2' %} {% include 'templates/docker/services/redis.yml.j2' %}

View File

@ -28,3 +28,4 @@ watch -n 2 "docker compose ps -a"
- https://www.cyberciti.biz/faq/linux-command-to-remove-virtual-interfaces-or-network-aliases/ - https://www.cyberciti.biz/faq/linux-command-to-remove-virtual-interfaces-or-network-aliases/
- https://www.cyberciti.biz/faq/linux-restart-network-interface/ - https://www.cyberciti.biz/faq/linux-restart-network-interface/
- https://stackoverflow.com/questions/53347951/docker-network-not-found - https://stackoverflow.com/questions/53347951/docker-network-not-found
- https://github.com/bigbluebutton/docker/issues/325

View File

@ -1,5 +1,3 @@
version: '3.8'
services: services:
{% include 'templates/docker/services/redis.yml.j2' %} {% include 'templates/docker/services/redis.yml.j2' %}

View File

@ -1,5 +1,3 @@
version: '3.2'
services: services:
elasticsearch: elasticsearch:
build: build:

View File

@ -1,5 +1,3 @@
version: "3"
services: services:
{% include 'templates/docker/services/redis.yml.j2' %} {% include 'templates/docker/services/redis.yml.j2' %}

View File

@ -1,5 +1,3 @@
version: '3'
services: services:
{% include 'templates/docker/services/' + database_type + '.yml.j2' %} {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

View File

@ -1,4 +1,3 @@
version: '3.6'
services: services:
{% include 'templates/docker/services/redis.yml.j2' %} {% include 'templates/docker/services/redis.yml.j2' %}

View File

@ -1,5 +1,3 @@
version: '3'
services: services:
{% include 'templates/docker/services/' + database_type + '.yml.j2' %} {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

View File

@ -1,5 +1,3 @@
version: '3'
services: services:
openldap: openldap:
image: osixia/openldap:1.2.4 image: osixia/openldap:1.2.4

View File

@ -1,5 +1,3 @@
version: "3.7"
services: services:
{% include 'templates/docker/services/' + database_type + '.yml.j2' %} {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

View File

@ -1,5 +1,3 @@
version: '2.2'
services: services:
{% include 'templates/docker/services/redis.yml.j2' %} {% include 'templates/docker/services/redis.yml.j2' %}

View File

@ -1,4 +1,3 @@
version: '3'
services: services:
{% include 'templates/docker/services/redis.yml.j2' %} {% include 'templates/docker/services/redis.yml.j2' %}

View File

@ -1,5 +1,3 @@
version: '3'
services: services:
{% include 'templates/docker/services/' + database_type + '.yml.j2' %} {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

View File

@ -1,5 +1,3 @@
version: '3.1'
services: services:
{% include 'templates/docker/services/' + database_type + '.yml.j2' %} {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

View File

@ -5,6 +5,9 @@ services:
image: docker.io/bitnami/moodle:latest image: docker.io/bitnami/moodle:latest
ports: ports:
- 127.0.0.1:{{http_port}}:8080 - 127.0.0.1:{{http_port}}:8080
restart: {{docker_restart_policy}}
logging:
driver: journald
environment: environment:
- MOODLE_DATABASE_HOST={{database_host}} - MOODLE_DATABASE_HOST={{database_host}}
- MOODLE_DATABASE_PORT_NUMBER=3306 - MOODLE_DATABASE_PORT_NUMBER=3306
@ -22,6 +25,12 @@ services:
volumes: volumes:
- 'moodle:/bitnami/moodle' - 'moodle:/bitnami/moodle'
- 'data:/bitnami/moodledata' - 'data:/bitnami/moodledata'
# Healthcheck is not possible due to missing curl and wget in container
# healthcheck:
# test: ["CMD", "curl", "-f", "http://127.0.0.1:8080"]
# interval: 1m
# timeout: 10s
# retries: 3
{% include 'templates/docker/container/depends-on-just-database.yml.j2' %} {% include 'templates/docker/container/depends-on-just-database.yml.j2' %}
{% include 'templates/docker/container/networks.yml.j2' %} {% include 'templates/docker/container/networks.yml.j2' %}

View File

@ -1,4 +1,3 @@
version: '3.8'
services: services:
{% include 'templates/docker/services/' + database_type + '.yml.j2' %} {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

View File

@ -1,5 +1,3 @@
version: '3'
services: services:
{% include 'templates/docker/services/redis.yml.j2' %} {% include 'templates/docker/services/redis.yml.j2' %}

View File

@ -1,7 +1,6 @@
version: "3.7"
x-op-app: &app x-op-app: &app
restart: {{docker_restart_policy}} logging:
driver: journald
image: custom_openproject image: custom_openproject
environment: environment:
OPENPROJECT_HTTPS: "${OPENPROJECT_HTTPS}" OPENPROJECT_HTTPS: "${OPENPROJECT_HTTPS}"
@ -27,10 +26,14 @@ services:
image: memcached image: memcached
container_name: openproject-memcached container_name: openproject-memcached
restart: {{docker_restart_policy}} restart: {{docker_restart_policy}}
logging:
driver: journald
{% include 'templates/docker/container/networks.yml.j2' %} {% include 'templates/docker/container/networks.yml.j2' %}
proxy: proxy:
restart: {{docker_restart_policy}} restart: {{docker_restart_policy}}
logging:
driver: journald
image: custom_openproject image: custom_openproject
container_name: openproject-proxy container_name: openproject-proxy
command: "./docker/prod/proxy" command: "./docker/prod/proxy"
@ -48,6 +51,7 @@ services:
web: web:
<<: *app <<: *app
restart: {{docker_restart_policy}}
command: "./docker/prod/web" command: "./docker/prod/web"
container_name: openproject-web container_name: openproject-web
{% include 'templates/docker/container/networks.yml.j2' %} {% include 'templates/docker/container/networks.yml.j2' %}
@ -68,6 +72,9 @@ services:
autoheal: autoheal:
image: willfarrell/autoheal:1.2.0 image: willfarrell/autoheal:1.2.0
container_name: openproject-autoheal container_name: openproject-autoheal
restart: {{docker_restart_policy}}
logging:
driver: journald
volumes: volumes:
- "/var/run/docker.sock:/var/run/docker.sock" - "/var/run/docker.sock:/var/run/docker.sock"
environment: environment:
@ -77,6 +84,7 @@ services:
worker: worker:
<<: *app <<: *app
restart: {{docker_restart_policy}}
command: "./docker/prod/worker" command: "./docker/prod/worker"
container_name: openproject-worker container_name: openproject-worker
{% include 'templates/docker/container/networks.yml.j2' %} {% include 'templates/docker/container/networks.yml.j2' %}
@ -88,6 +96,7 @@ services:
cron: cron:
<<: *app <<: *app
restart: {{docker_restart_policy}}
command: "./docker/prod/cron" command: "./docker/prod/cron"
container_name: openproject-cron container_name: openproject-cron
{% include 'templates/docker/container/networks.yml.j2' %} {% include 'templates/docker/container/networks.yml.j2' %}

View File

@ -1,5 +1,3 @@
version: "3.3"
services: services:
{% include 'templates/docker/services/redis.yml.j2' %} {% include 'templates/docker/services/redis.yml.j2' %}

View File

@ -1,5 +1,3 @@
version: '2'
services: services:
{% include 'templates/docker/services/' + database_type + '.yml.j2' %} {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

View File

@ -1,4 +1,3 @@
version: '3.7'
services: services:
application: application:
container_name: roulette_application container_name: roulette_application

View File

@ -1,5 +1,3 @@
version: '3'
services: services:
{% include 'templates/docker/services/' + database_type + '.yml.j2' %} {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

View File

@ -1,5 +1,3 @@
version: '3'
services: services:
{% include 'templates/docker/services/' + database_type + '.yml.j2' %} {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

View File

@ -1,6 +0,0 @@
- name: "restart timer"
systemd:
name: "{{service_name}}.cymais.timer"
state: restarted
enabled: yes
daemon_reload: yes

View File

@ -3,5 +3,11 @@
src: dummy.timer.j2 src: dummy.timer.j2
dest: "/etc/systemd/system/{{service_name}}.cymais.timer" dest: "/etc/systemd/system/{{service_name}}.cymais.timer"
register: dummy_timer register: dummy_timer
changed_when: dummy_timer.changed or activate_all_timers | bool
notify: restart timer - name: "restart timer"
systemd:
daemon_reload: yes
name: "{{service_name}}.cymais.timer"
state: restarted
enabled: yes
when: dummy_timer.changed or activate_all_timers | bool