Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1719 We're using a pinned commit of this fork, which patches up the npm/yarn lock files, so that self-building of the Discord and Slack bridges can work after GitHub's deprecation of the `git://` and `ssh://` protocols (https://github.blog/2021-09-01-improving-git-protocol-security-github/). When the issue gets fixed in the Beeper fork (via https://gitlab.com/beeper/mx-puppet-monorepo/-/merge_requests/35 or otherwise), we'll get back on it.pull/1721/head
| @@ -11,7 +11,7 @@ | |||||
| matrix_mx_puppet_discord_enabled: true | matrix_mx_puppet_discord_enabled: true | ||||
| matrix_mx_puppet_discord_container_image_self_build: false | matrix_mx_puppet_discord_container_image_self_build: false | ||||
| matrix_mx_puppet_discord_container_image_self_build_repo: "https://gitlab.com/beeper/mx-puppet-monorepo" | |||||
| matrix_mx_puppet_discord_container_image_self_build_repo: "https://gitlab.com/Myned/mx-puppet-monorepo" | |||||
| matrix_mx_puppet_discord_container_image_self_build_version: "{{ 'main' if matrix_mx_puppet_discord_version == 'latest' else matrix_mx_puppet_discord_version }}" | matrix_mx_puppet_discord_container_image_self_build_version: "{{ 'main' if matrix_mx_puppet_discord_version == 'latest' else matrix_mx_puppet_discord_version }}" | ||||
| matrix_mx_puppet_discord_container_image_self_build_dockerfile_path: "docker/Dockerfile-discord" | matrix_mx_puppet_discord_container_image_self_build_dockerfile_path: "docker/Dockerfile-discord" | ||||
| @@ -20,7 +20,7 @@ matrix_mx_puppet_discord_container_image_self_build_dockerfile_path: "docker/Doc | |||||
| # Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:8432"), or empty string to not expose. | # Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:8432"), or empty string to not expose. | ||||
| matrix_mx_puppet_discord_container_http_host_bind_port: '' | matrix_mx_puppet_discord_container_http_host_bind_port: '' | ||||
| matrix_mx_puppet_discord_version: latest | |||||
| matrix_mx_puppet_discord_version: 40f3142032bacec6333f4bbc051d5e30af88de9c | |||||
| matrix_mx_puppet_discord_docker_image: "{{ matrix_mx_puppet_discord_docker_image_name_prefix }}beeper/mx-puppet-monorepo/discord:{{ matrix_mx_puppet_discord_version }}" | matrix_mx_puppet_discord_docker_image: "{{ matrix_mx_puppet_discord_docker_image_name_prefix }}beeper/mx-puppet-monorepo/discord:{{ matrix_mx_puppet_discord_version }}" | ||||
| matrix_mx_puppet_discord_docker_image_name_prefix: "{{ 'localhost/' if matrix_mx_puppet_discord_container_image_self_build else 'registry.gitlab.com/' }}" | matrix_mx_puppet_discord_docker_image_name_prefix: "{{ 'localhost/' if matrix_mx_puppet_discord_container_image_self_build else 'registry.gitlab.com/' }}" | ||||
| matrix_mx_puppet_discord_docker_image_force_pull: "{{ matrix_mx_puppet_discord_docker_image.endswith(':latest') }}" | matrix_mx_puppet_discord_docker_image_force_pull: "{{ matrix_mx_puppet_discord_docker_image.endswith(':latest') }}" | ||||
| @@ -8,7 +8,7 @@ matrix_mx_puppet_slack_oauth_client_id: '' | |||||
| matrix_mx_puppet_slack_oauth_client_secret: '' | matrix_mx_puppet_slack_oauth_client_secret: '' | ||||
| matrix_mx_puppet_slack_container_image_self_build: false | matrix_mx_puppet_slack_container_image_self_build: false | ||||
| matrix_mx_puppet_slack_container_image_self_build_repo: "https://gitlab.com/beeper/mx-puppet-monorepo.git" | |||||
| matrix_mx_puppet_slack_container_image_self_build_repo: "https://gitlab.com/Myned/mx-puppet-monorepo" | |||||
| matrix_mx_puppet_slack_container_image_self_build_version: "{{ 'main' if matrix_mx_puppet_slack_version == 'latest' else matrix_mx_puppet_slack_version }}" | matrix_mx_puppet_slack_container_image_self_build_version: "{{ 'main' if matrix_mx_puppet_slack_version == 'latest' else matrix_mx_puppet_slack_version }}" | ||||
| matrix_mx_puppet_slack_container_image_self_build_dockerfile_path: "docker/Dockerfile-slack" | matrix_mx_puppet_slack_container_image_self_build_dockerfile_path: "docker/Dockerfile-slack" | ||||
| @@ -17,7 +17,7 @@ matrix_mx_puppet_slack_container_image_self_build_dockerfile_path: "docker/Docke | |||||
| # Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:8432"), or empty string to not expose. | # Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:8432"), or empty string to not expose. | ||||
| matrix_mx_puppet_slack_container_http_host_bind_port: '' | matrix_mx_puppet_slack_container_http_host_bind_port: '' | ||||
| matrix_mx_puppet_slack_version: latest | |||||
| matrix_mx_puppet_slack_version: 40f3142032bacec6333f4bbc051d5e30af88de9c | |||||
| matrix_mx_puppet_slack_docker_image: "{{ matrix_mx_puppet_slack_docker_image_name_prefix }}beeper/mx-puppet-monorepo/slack:{{ matrix_mx_puppet_slack_version }}" | matrix_mx_puppet_slack_docker_image: "{{ matrix_mx_puppet_slack_docker_image_name_prefix }}beeper/mx-puppet-monorepo/slack:{{ matrix_mx_puppet_slack_version }}" | ||||
| matrix_mx_puppet_slack_docker_image_name_prefix: "{{ 'localhost/' if matrix_mx_puppet_slack_container_image_self_build else 'registry.gitlab.com/' }}" | matrix_mx_puppet_slack_docker_image_name_prefix: "{{ 'localhost/' if matrix_mx_puppet_slack_container_image_self_build else 'registry.gitlab.com/' }}" | ||||
| matrix_mx_puppet_slack_docker_image_force_pull: "{{ matrix_mx_puppet_slack_docker_image.endswith(':latest') }}" | matrix_mx_puppet_slack_docker_image_force_pull: "{{ matrix_mx_puppet_slack_docker_image.endswith(':latest') }}" | ||||