From 1da35d57709480ecde0573a33647f8dcb17ebffb Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 27 May 2023 13:00:52 +0930 Subject: [PATCH 1/3] feat(playbooks): add nfc ansible playbooks to image !11 #7 nofusscomputing/projects/ansible/ansible_playbooks!1 nofusscomputing/projects/ansible/ansible_playbooks#1 --- dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dockerfile b/dockerfile index 7572fc5..aacf95a 100644 --- a/dockerfile +++ b/dockerfile @@ -15,6 +15,9 @@ RUN apt update \ RUN git clone -b development --depth 1 https://gitlab.com/nofusscomputing/projects/ansible-roles.git /tmp/ansible-roles \ && cd /tmp/ansible-roles \ + && git submodule update --init \ + && git clone -b development --depth 1 https://gitlab.com/nofusscomputing/projects/ansible/ansible_playbooks.git /tmp/ansible_playbooks \ + && cd /tmp/ansible_playbooks \ && git submodule update --init @@ -25,9 +28,14 @@ FROM --platform=$TARGETPLATFORM python:3.11-bullseye # Ansible chucks a wobbler without. see: https://github.com/ansible/ansible/issues/78283 ENV LC_ALL en_US.UTF-8 +ENV ANSIBLE_PLAYBOOK_DIR=/etc/ansible/playbooks + COPY --from=fetch-ansible-roles /tmp/ansible-roles/roles /etc/ansible/roles +COPY --from=fetch-ansible-roles /tmp/ansible_playbooks /etc/ansible/playbooks + + # Ref: https://github.com/opencontainers/image-spec/blob/d86384efdb8c30770a92415c100f57a9bffbb64e/annotations.md LABEL \ # org.opencontainers.image.authors="{contributor url}" \ From c98427e00ecf25eff3be3df523c17c1437703cbf Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 27 May 2023 13:01:25 +0930 Subject: [PATCH 2/3] chore(git): update to current HEAD #11 --- gitlab-ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab-ci b/gitlab-ci index df2ab75..0a17fe1 160000 --- a/gitlab-ci +++ b/gitlab-ci @@ -1 +1 @@ -Subproject commit df2ab75e6aa25ac00a75fc5c59419af2e04b1a75 +Subproject commit 0a17fe1aa320c658c05d7a693ff76af4a54e6130 From 07cdde820a6b42e607966257c373239bb1b20ccb Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 27 May 2023 13:53:51 +0930 Subject: [PATCH 3/3] refactor(playbooks): seperated git clone to own run !11 closes #7 nofusscomputing/projects/ansible/ansible_playbooks!1 nofusscomputing/projects/ansible/ansible_playbooks#1 --- dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dockerfile b/dockerfile index aacf95a..af07300 100644 --- a/dockerfile +++ b/dockerfile @@ -15,8 +15,9 @@ RUN apt update \ RUN git clone -b development --depth 1 https://gitlab.com/nofusscomputing/projects/ansible-roles.git /tmp/ansible-roles \ && cd /tmp/ansible-roles \ - && git submodule update --init \ - && git clone -b development --depth 1 https://gitlab.com/nofusscomputing/projects/ansible/ansible_playbooks.git /tmp/ansible_playbooks \ + && git submodule update --init + +RUN git clone -b development --depth 1 https://gitlab.com/nofusscomputing/projects/ansible/ansible_playbooks.git /tmp/ansible_playbooks \ && cd /tmp/ansible_playbooks \ && git submodule update --init