From 1a2ac54f42a28a238b5af15ab8904b6d596c5e64 Mon Sep 17 00:00:00 2001 From: saibotk Date: Tue, 27 Oct 2020 16:20:37 +0100 Subject: [PATCH] matrix: Fix image names --- roles/matrix/defaults/main.yml | 2 +- roles/matrix/templates/docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/matrix/defaults/main.yml b/roles/matrix/defaults/main.yml index 8968ec5..b16e86d 100644 --- a/roles/matrix/defaults/main.yml +++ b/roles/matrix/defaults/main.yml @@ -50,7 +50,7 @@ matrix_delegate_nginx_version: "1.19" matrix_elementweb_version: "v1.7.11" # Container tag definitions -matrix_synapse_image_version: "{{ matrix_synapse_version }}" +matrix_synapse_image_version: "v{{ matrix_synapse_version }}" matrix_database_image_version: "{{ matrix_database_version }}-alpine" matrix_delegate_nginx_image_version: "{{ matrix_delegate_nginx_version }}-alpine" matrix_elementweb_image_version: "{{ matrix_elementweb_version }}" diff --git a/roles/matrix/templates/docker-compose.yml b/roles/matrix/templates/docker-compose.yml index 2a82bc8..cf933fa 100644 --- a/roles/matrix/templates/docker-compose.yml +++ b/roles/matrix/templates/docker-compose.yml @@ -69,7 +69,7 @@ services: {% endif %} database: - image: docker.io/postgres:{{ matrix_database_image_version }} + image: docker.io/library/postgres:{{ matrix_database_image_version }} mem_limit: 512mb memswap_limit: 768mb read_only: true @@ -91,7 +91,7 @@ services: restart: always delegate: - image: docker.io/nginx:{{ matrix_delegate_nginx_image_version }} + image: docker.io/library/nginx:{{ matrix_delegate_nginx_image_version }} mem_limit: 256mb memswap_limit: 512mb read_only: true