From 0b344d61a414ca2c1a9c575315a1b41af726f4a0 Mon Sep 17 00:00:00 2001
From: Sven Ketelsen <sven.ketelsen@netgo.de>
Date: Mon, 31 Jan 2022 13:36:08 +0100
Subject: [PATCH] DEV-317: switched build image to smardigo-ci-ansible

- ansible-lint
- ansible-builder
---
 .gitlab-ci.yml                 | 21 ++++++++++-----------
 scripts/update-docker-image.sh |  6 +++---
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 099d7c4..29fc89a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,7 @@
 ---
+variables:
+  AWX_EE_DOCKER_IMAGE_EXTERN: "dev-harbor-01.smardigo.digital/awx/awx-custom-ee"
+
 image: docker-cache.dev-at.de/docker:19
 
 services:
@@ -11,25 +14,21 @@ stages:
 
 ansible-lint-job:
   stage: ansible-lint
-  image: dev-harbor-01.smardigo.digital/awx/awx-custom-ee:latest
-  before_script:
-    - pip install ansible-lint
+  image: dev-harbor-01.smardigo.digital/smardigo/smardigo-ci-ansible
   script:
-    - echo "running ansible-lint to check for linting violations"
-    - /usr/local/bin/ansible-lint -c ansible-lint.cfg
+    - echo "Running ansible-lint to check for linting violations"
+    - ansible-lint -c ansible-lint.cfg
   tags:
     - dind
 
-ansible-builder-job-dev:
+ansible-builder-job:
   stage: ansible-builder
   before_script:
     - cd ansible-builder
-    - apk add py3-pip
-    - pip3 install ansible-builder
   script:
-    - echo "running ansible-build to build dev-harbor-01.smardigo.digital/awx/awx-custom-ee:latest"
-    - ansible-builder build -v 3 --tag dev-harbor-01.smardigo.digital/awx/awx-custom-ee:latest
-    - docker push dev-harbor-01.smardigo.digital/awx/awx-custom-ee:latest
+    - echo "Running ansible-build to build awx execution environment"
+    - ansible-builder build -v 3 --tag $AWX_EE_DOCKER_IMAGE_EXTERN:latest
+    - docker push $AWX_EE_DOCKER_IMAGE_EXTERN:latest
   only:
     - master
   except:
diff --git a/scripts/update-docker-image.sh b/scripts/update-docker-image.sh
index 5bb3e4e..93119c5 100644
--- a/scripts/update-docker-image.sh
+++ b/scripts/update-docker-image.sh
@@ -13,6 +13,6 @@ echo
 echo updating $TO with image from $FROM
 echo
 
-ssh docker docker pull $FROM
-ssh docker docker tag $FROM $TO
-ssh docker docker push $TO
+docker pull $FROM
+docker tag $FROM $TO
+docker push $TO