Просмотр исходного кода

Add self-building support to matrix-email2matrix

pull/1217/head
Slavi Pantaleev 4 лет назад
Родитель
Сommit
421f85defa
4 измененных файлов: 36 добавлений и 3 удалений
  1. +1
    -0
      docs/self-building.md
  2. +2
    -0
      group_vars/matrix_servers
  3. +7
    -1
      roles/matrix-email2matrix/defaults/main.yml
  4. +26
    -2
      roles/matrix-email2matrix/tasks/setup_install.yml

+ 1
- 0
docs/self-building.md Просмотреть файл

@@ -29,6 +29,7 @@ List of roles where self-building the Docker image is currently possible:
- `matrix-bridge-mx-puppet-skype`
- `matrix-bot-mjolnir`
- `matrix-bot-matrix-reminder-bot`
- `matrix-email2matrix`

Adding self-building support to other roles is welcome. Feel free to contribute!



+ 2
- 0
group_vars/matrix_servers Просмотреть файл

@@ -1037,6 +1037,8 @@ matrix_dynamic_dns_enabled: false

matrix_email2matrix_enabled: false

matrix_email2matrix_container_image_self_build: "{{ matrix_architecture != 'amd64' }}"

######################################################################
#
# /matrix-email2matrix


+ 7
- 1
roles/matrix-email2matrix/defaults/main.yml Просмотреть файл

@@ -2,9 +2,15 @@ matrix_email2matrix_enabled: true

matrix_email2matrix_base_path: "{{ matrix_base_data_path }}/email2matrix"
matrix_email2matrix_config_dir_path: "{{ matrix_email2matrix_base_path }}/config"
matrix_email2matrix_docker_src_files_path: "{{ matrix_email2matrix_base_path }}/docker-src"

matrix_email2matrix_container_image_self_build: false
matrix_email2matrix_container_image_self_build_repo: "https://github.com/devture/email2matrix.git"
matrix_email2matrix_container_image_self_build_branch: "{{ matrix_email2matrix_version }}"

matrix_email2matrix_version: 1.0.1
matrix_email2matrix_docker_image: "{{ matrix_container_global_registry_prefix }}devture/email2matrix:{{ matrix_email2matrix_version }}"
matrix_email2matrix_docker_image_prefix: "{{ 'localhost/' if matrix_email2matrix_container_image_self_build else matrix_container_global_registry_prefix }}"
matrix_email2matrix_docker_image: "{{ matrix_email2matrix_docker_image_prefix }}devture/email2matrix:{{ matrix_email2matrix_version }}"
matrix_email2matrix_docker_image_force_pull: "{{ matrix_email2matrix_docker_image.endswith(':latest') }}"

# A list of extra arguments to pass to the container


+ 26
- 2
roles/matrix-email2matrix/tasks/setup_install.yml Просмотреть файл

@@ -8,8 +8,10 @@
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
with_items:
- "{{ matrix_email2matrix_base_path }}"
- "{{ matrix_email2matrix_config_dir_path }}"
- { path: "{{ matrix_email2matrix_base_path }}", when: true }
- { path: "{{ matrix_email2matrix_config_dir_path }}", when: true }
- { path: "{{ matrix_email2matrix_docker_src_files_path }}", when: "{{ matrix_email2matrix_container_image_self_build }}"}
when: "item.when|bool"

- name: Ensure Email2Matrix configuration file created
template:
@@ -25,6 +27,28 @@
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_email2matrix_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_email2matrix_docker_image_force_pull }}"
when: "not matrix_email2matrix_container_image_self_build|bool"

- name: Ensure Email2Matrix repository is present on self-build
git:
repo: "{{ matrix_email2matrix_container_image_self_build_repo }}"
dest: "{{ matrix_email2matrix_docker_src_files_path }}"
version: "{{ matrix_email2matrix_container_image_self_build_branch }}"
force: "yes"
register: matrix_email2matrix_git_pull_results
when: "matrix_email2matrix_container_image_self_build|bool"

- name: Ensure Email2Matrix Docker image is built
docker_image:
name: "{{ matrix_email2matrix_docker_image }}"
source: build
force_source: "{{ matrix_email2matrix_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_email2matrix_git_pull_results.changed }}"
build:
dockerfile: etc/docker/Dockerfile
path: "{{ matrix_email2matrix_docker_src_files_path }}"
pull: yes
when: "matrix_email2matrix_container_image_self_build|bool"

- name: Ensure matrix-email2matrix.service installed
template:


Загрузка…
Отмена
Сохранить