diff --git a/dockerfile b/dockerfile index 7572fc5..af07300 100644 --- a/dockerfile +++ b/dockerfile @@ -17,6 +17,10 @@ RUN git clone -b development --depth 1 https://gitlab.com/nofusscomputing/projec && cd /tmp/ansible-roles \ && 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 + @@ -25,9 +29,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}" \ 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