From ea93ce9019c6cadccfa24fed7a46d9dedcb86f71 Mon Sep 17 00:00:00 2001
From: Hoan To <hoan.to@netgo.de>
Date: Wed, 12 Apr 2023 14:10:10 +0000
Subject: [PATCH] Dev 997 provisioning galaxy role

---
 .gitlab-ci.yml                     |  5 +++--
 ansible-builder/context/Dockerfile | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc1c66a..2d3f8dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,8 +39,9 @@ builder-job:
   before_script:
     - cd ansible-builder
   script:
-    - echo "Running ansible-builder to build awx execution environment"
-    - ansible-builder build -v 3 --tag $AWX_EE_DOCKER_IMAGE_EXTERN:latest
+    - cp $SSH_KEY_GITLAB_CI_BUILDER_FILE ansible-builder/context/id_ed25519
+    - echo "Running docker build to build awx execution environment"
+    - docker build -f ansible-builder/context/Dockerfile -t $AWX_EE_DOCKER_IMAGE_EXTERN:latest .
     - docker push $AWX_EE_DOCKER_IMAGE_EXTERN:latest
   only:
     refs:
diff --git a/ansible-builder/context/Dockerfile b/ansible-builder/context/Dockerfile
index 8ba76d7..0952be9 100644
--- a/ansible-builder/context/Dockerfile
+++ b/ansible-builder/context/Dockerfile
@@ -5,18 +5,26 @@ FROM $EE_BASE_IMAGE as galaxy
 ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS=
 USER root
 
-ADD _build /build
+RUN mkdir -p ~/.ssh
+RUN chmod 700 ~/.ssh
+ADD ansible-builder/context/id_ed25519 ~/.ssh/id_ed25519
+
+RUN mkdir /build
 WORKDIR /build
+ADD galaxy-requirements.yml requirements.yml
+ADD pip-requirements requirements.txt
+ADD ansible-builder/bindep.txt bindep.txt
+
 
-RUN ansible-galaxy role install -r requirements.yml --roles-path /usr/share/ansible/roles
+RUN exec ssh-agent bash && ssh-add ~/.ssh/id_ed25519 && ansible-galaxy role install -r requirements.yml --roles-path /usr/share/ansible/roles
 RUN ansible-galaxy collection install $ANSIBLE_GALAXY_CLI_COLLECTION_OPTS -r requirements.yml --collections-path /usr/share/ansible/collections
 
 FROM $EE_BUILDER_IMAGE as builder
 
 COPY --from=galaxy /usr/share/ansible /usr/share/ansible
 
-ADD _build/requirements.txt requirements.txt
-ADD _build/bindep.txt bindep.txt
+ADD pip-requirements requirements.txt
+ADD ansible-builder/bindep.txt bindep.txt
 RUN ansible-builder introspect --sanitize --user-pip=requirements.txt --user-bindep=bindep.txt --write-bindep=/tmp/src/bindep.txt --write-pip=/tmp/src/requirements.txt
 RUN assemble
 
@@ -30,7 +38,7 @@ RUN /output/install-from-bindep && rm -rf /output/wheels
 RUN alternatives --set python /usr/bin/python3
 COPY --from=quay.io/project-receptor/receptor:0.9.7 /usr/bin/receptor /usr/bin/receptor
 RUN mkdir -p /var/run/receptor
-ADD run.sh /run.sh
+ADD ansible-builder/context/run.sh /run.sh
 CMD /run.sh
 USER 1000
 RUN git lfs install