From 99f8b6f52efaa3dfa2f3786762a3c4de8213ffc7 Mon Sep 17 00:00:00 2001 From: Phillip Date: Tue, 10 Dec 2024 08:44:31 +0100 Subject: [PATCH] BC-8524 update mailcatcher to official image (#1051) --- ansible/group_vars/develop/dof_mailcatcher.yml | 3 --- ansible/group_vars/infra/dof_mailcatcher.yml | 3 --- ansible/group_vars/loadtest/dof_mailcatcher.yml | 3 --- ansible/roles/dof_mailcatcher/defaults/main.yaml | 4 ++++ 4 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 ansible/group_vars/develop/dof_mailcatcher.yml delete mode 100644 ansible/group_vars/infra/dof_mailcatcher.yml delete mode 100644 ansible/group_vars/loadtest/dof_mailcatcher.yml create mode 100644 ansible/roles/dof_mailcatcher/defaults/main.yaml diff --git a/ansible/group_vars/develop/dof_mailcatcher.yml b/ansible/group_vars/develop/dof_mailcatcher.yml deleted file mode 100644 index df17fb9a5..000000000 --- a/ansible/group_vars/develop/dof_mailcatcher.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -MAILCATCHER_IMAGE_NAME: schickling/mailcatcher -MAILCATCHER_IMAGE_TAG: latest \ No newline at end of file diff --git a/ansible/group_vars/infra/dof_mailcatcher.yml b/ansible/group_vars/infra/dof_mailcatcher.yml deleted file mode 100644 index df17fb9a5..000000000 --- a/ansible/group_vars/infra/dof_mailcatcher.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -MAILCATCHER_IMAGE_NAME: schickling/mailcatcher -MAILCATCHER_IMAGE_TAG: latest \ No newline at end of file diff --git a/ansible/group_vars/loadtest/dof_mailcatcher.yml b/ansible/group_vars/loadtest/dof_mailcatcher.yml deleted file mode 100644 index df17fb9a5..000000000 --- a/ansible/group_vars/loadtest/dof_mailcatcher.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -MAILCATCHER_IMAGE_NAME: schickling/mailcatcher -MAILCATCHER_IMAGE_TAG: latest \ No newline at end of file diff --git a/ansible/roles/dof_mailcatcher/defaults/main.yaml b/ansible/roles/dof_mailcatcher/defaults/main.yaml new file mode 100644 index 000000000..d9a023a09 --- /dev/null +++ b/ansible/roles/dof_mailcatcher/defaults/main.yaml @@ -0,0 +1,4 @@ +--- +MAILCATCHER_IMAGE_NAME: docker.io/sj26/mailcatcher +# alpha releases also come in latest! +MAILCATCHER_IMAGE_TAG: v0.10.0 \ No newline at end of file