From c1b5a4d449f8ff76433d330fccfc26875f1f1e0e Mon Sep 17 00:00:00 2001
From: Daan Boerlage <d@boerlage.me>
Date: Tue, 19 Jul 2022 16:53:35 +0200
Subject: [PATCH] Upgrade to ansible 2.12 in an attempt to fix the deployment

---
 .deploy.yml              | 10 +++++-----
 .gitlab-ci.yml           |  3 ++-
 ansible-requirements.yml |  3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 ansible-requirements.yml

diff --git a/.deploy.yml b/.deploy.yml
index fed249a..5fb394d 100644
--- a/.deploy.yml
+++ b/.deploy.yml
@@ -7,13 +7,13 @@
     ansible_python_interpreter: /usr/bin/python3
   tasks:
     - name: Login to Gitlab Docker Registry
-      docker_login:
+      'community.docker.docker_login':
         registry_url: "{{ lookup('env', 'CI_REGISTRY') }}"
         username: "{{ lookup('env', 'CI_REGISTRY_USER') }}"
         password: "{{ lookup('env', 'CI_REGISTRY_PASSWORD') }}"
         reauthorize: yes
     - name: Replace Prod Container
-      docker_container:
+      'community.docker.docker_container':
         name: GeekbotProd
         image: "{{ lookup('env', 'IMAGE_TAG') }}"
         recreate: yes
@@ -33,6 +33,6 @@
           GEEKBOT_SUMOLOGIC: "{{ lookup('env', 'GEEKBOT_SUMOLOCIG') }}"
           GEEKBOT_SENTRY: "{{ lookup('env', 'GEEKBOT_SENTRY') }}"
           GEEKBOT_DB_REDSHIFT_COMPAT: "true"
-#    - name: Cleanup Old Container
-#      docker_prune:
-#        images: yes
+    - name: Cleanup Old Container
+      'community.docker.docker_prune':
+        images: yes
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 968201f..30fa887 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ Package:
 
 Deploy:
   stage: deploy
-  image: runebaas/ansible-runner:v1.4.7
+  image: quay.io/ansible/ansible-runner:stable-2.12-latest
   only:
     - master
   variables:
@@ -46,6 +46,7 @@ Deploy:
     - chmod -R 600 /root/.ssh
     - ssh-keyscan -p 65432 $PROD_IP > /root/.ssh/known_hosts
   script:
+    - ansible-galaxy collection install -r ansible-requirements.yml
     - ansible-playbook -i $PROD_IP, .deploy.yml
 
 Sentry:
diff --git a/ansible-requirements.yml b/ansible-requirements.yml
new file mode 100644
index 0000000..90d8fb4
--- /dev/null
+++ b/ansible-requirements.yml
@@ -0,0 +1,3 @@
+collections:
+  - name: community.docker
+    version: 2.7.0
\ No newline at end of file