From 0aab6019870984c81da434facb2725b78fca326c Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jan.tuomi@eficode.com>
Date: Sat, 28 Dec 2019 23:12:22 +0200
Subject: Add docker login

---
 .gitlab-ci.yml               | 3 ++-
 ansible/deploy-playbook.yaml | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f62e37d..5ce77d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,4 +27,5 @@ deploy:
   script:
     - apt update && apt install software-properties-common -y && apt-add-repository ppa:ansible/ansible && apt update && apt install ansible -y
     - chmod 600 "$SSH_PRIVATE_KEY_FILE"
-    - ansible-playbook --private-key "$SSH_PRIVATE_KEY_FILE" -i "$INVENTORY_FILE" -e "image_name=$IMAGE" -u root ansible/deploy-playbook.yaml
+    - IMAGE="$IMAGE_NAME:$CI_COMMIT_TAG"
+    - ansible-playbook --private-key "$SSH_PRIVATE_KEY_FILE" -i "$INVENTORY_FILE" -e "image_name=$IMAGE docker_user=gitlab-ci-token docker_password=$CI_JOB_TOKEN docker_registry=$CI_REGISTRY" -u root ansible/deploy-playbook.yaml
diff --git a/ansible/deploy-playbook.yaml b/ansible/deploy-playbook.yaml
index 21587ad..c420716 100644
--- a/ansible/deploy-playbook.yaml
+++ b/ansible/deploy-playbook.yaml
@@ -1,11 +1,14 @@
 ---
 - hosts: all
   become: true
-  vars:
-    container_name: nginx
-    image_name: nginx
 
   tasks:
+    - name: Docker login
+      docker_login:
+        username: "{{ docker_user }}"
+        password: "{{ docker_password }}"
+        registry: "{{ docker_registry }}"
+
     - name: Pull app image
       docker_image:
         name: "{{ image_name }}"
-- 
cgit v1.3