2 Commits

15 changed files with 26 additions and 23 deletions

View File

@@ -1,6 +1,6 @@
{# integrate it into service sections to be build by Dockerfile #}
pull_policy: never
build:
context: .
dockerfile: Dockerfile
pull_policy: never
build:
context: .
dockerfile: Dockerfile
{# pass Arguments here #}

View File

@@ -3,7 +3,7 @@
postgres:
container_name: "{{ POSTGRES_CONTAINER }}"
image: "{{ POSTGRES_CUSTOM_IMAGE_NAME }}"
{% include 'roles/docker-container/templates/build.yml.j2' %}
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
command:
- "postgres"
- "-c"

View File

@@ -3,7 +3,10 @@
include_role:
name: sys-dns-cloudflare-records
vars:
cloudflare_records: "{{ SYN_DNS_WILDCARD_RECORDS }}"
cloudflare_records: "{{ SYN_DNS_WILDCARD_RECORDS }}"
cloudflare_async_enabled: "{{ ASYNC_ENABLED | bool }}"
cloudflare_async_time: "{{ ASYNC_TIME }}"
cloudflare_async_poll: "{{ ASYNC_POLL }}"
when: DNS_PROVIDER == 'cloudflare'
- include_tasks: utils/run_once.yml

View File

@@ -9,7 +9,7 @@
(python manage.py initdb || true) &&
python -m gunicorn bookwyrm.wsgi:application --bind 0.0.0.0:{{ container_port }}
'
{% include 'roles/docker-container/templates/build.yml.j2' %}
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
image: "{{ BOOKWYRM_CUSTOM_IMAGE }}"
container_name: "{{ BOOKWYRM_CONTAINER }}"
hostname: "{{ BOOKWYRM_HOSTNAME }}"

View File

@@ -1,7 +1,7 @@
{% include 'roles/docker-compose/templates/base.yml.j2' %}
application:
{% include 'roles/docker-container/templates/build.yml.j2' %}
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
args:
BRIDGY_REPO_URL: "{{ BRIDGY_REPO_URL }}"
BRIDGY_REPO_BRANCH: "{{ BRIDGY_REPO_BRANCH }}"

View File

@@ -1,6 +1,6 @@
{% include 'roles/docker-compose/templates/base.yml.j2' %}
application:
{% include 'roles/docker-container/templates/build.yml.j2' %}
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
args:
CHESS_VERSION: "{{ CHESS_VERSION }}"
CHESS_REPO_URL: "{{ CHESS_REPO_URL }}"

View File

@@ -1,6 +1,6 @@
{% include 'roles/docker-compose/templates/base.yml.j2' %}
application:
{% include 'roles/docker-container/templates/build.yml.j2' %}
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
image: "{{ CONFLUENCE_CUSTOM_IMAGE }}"
container_name: "{{ CONFLUENCE_CONTAINER }}"
hostname: '{{ CONFLUENCE_HOSTNAME}}'

View File

@@ -1,7 +1,7 @@
{% include 'roles/docker-compose/templates/base.yml.j2' %}
application:
{% include 'roles/docker-container/templates/build.yml.j2' %}
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
image: "{{ JIRA_CUSTOM_IMAGE }}"
container_name: "{{ JIRA_CONTAINER }}"
hostname: '{{ JIRA_HOSTNAME }}'

View File

@@ -3,7 +3,7 @@
moodle:
{% set container_port = 8080 %}
container_name: {{ moodle_container }}
{% include 'roles/docker-container/templates/build.yml.j2' %}
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
image: moodle_custom
ports:
- 127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}

View File

@@ -3,7 +3,7 @@ x-op-app: &app
logging:
driver: journald
image: {{ openproject_custom_image }}
{% include 'roles/docker-container/templates/build.yml.j2' %}
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(2) }}
{% include 'roles/docker-compose/templates/base.yml.j2' %}

View File

@@ -1,6 +1,6 @@
{% include 'roles/docker-compose/templates/base.yml.j2' %}
application:
{% include 'roles/docker-container/templates/build.yml.j2' %}
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
image: "{{ PRETIX_IMAGE_CUSTOM }}"
container_name: "{{ PRETIX_CONTAINER }}"
hostname: '{{ PRETIX_HOSTNAME}}'

View File

@@ -1,9 +1,9 @@
{% include 'roles/docker-compose/templates/base.yml.j2' %}
application:
container_name: roulette_application
{% include 'roles/docker-container/templates/build.yml.j2' %}
ports:
- 127.0.0.1:{{ ports.localhost.http[application_id] }}:8080
restart: {{ DOCKER_RESTART_POLICY }}
application:
container_name: roulette_application
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
ports:
- 127.0.0.1:{{ ports.localhost.http[application_id] }}:8080
restart: {{ DOCKER_RESTART_POLICY }}
{% include 'roles/docker-compose/templates/networks.yml.j2' %}

View File

@@ -3,7 +3,7 @@
{% include 'roles/docker-container/templates/base.yml.j2' %}
image: {{ WORDPRESS_CUSTOM_IMAGE }}
container_name: {{ WORDPRESS_CONTAINER }}
{% include 'roles/docker-container/templates/build.yml.j2' %}
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
ports:
- "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"
volumes:

View File

@@ -1,6 +1,6 @@
{% include 'roles/docker-compose/templates/base.yml.j2' %}
application:
{% include 'roles/docker-container/templates/build.yml.j2' %}
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
image: "{{ XWIKI_IMAGE_CUSTOM }}"
container_name: "{{ XWIKI_CONTAINER }}"
hostname: '{{ XWIKI_HOSTNAME}}'

View File

@@ -1,6 +1,6 @@
{% include 'roles/docker-compose/templates/base.yml.j2' %}
application:
{% include 'roles/docker-container/templates/build.yml.j2' %}
{{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
image: simpleicons-server:latest
container_name: simpleicons-server
ports: