diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c30c995..a624c8b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,10 +44,10 @@ builder-job: only: refs: - main - # changes: - # - pip-requirements - # - galaxy-requirements.yml - # - ansible-builder/**/* + changes: + - pip-requirements + - galaxy-requirements.yml + - ansible-builder/**/* except: - schedules tags: diff --git a/ansible-builder/context/Dockerfile b/ansible-builder/context/Dockerfile index 0952be9..5c4f0b4 100644 --- a/ansible-builder/context/Dockerfile +++ b/ansible-builder/context/Dockerfile @@ -5,9 +5,9 @@ FROM $EE_BASE_IMAGE as galaxy ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS= USER root -RUN mkdir -p ~/.ssh -RUN chmod 700 ~/.ssh -ADD ansible-builder/context/id_ed25519 ~/.ssh/id_ed25519 +RUN mkdir -p /root/.ssh +RUN chmod 700 /root/.ssh +ADD ansible-builder/context/id_ed25519 /root/.ssh/id_ed25519 RUN mkdir /build WORKDIR /build @@ -15,8 +15,8 @@ ADD galaxy-requirements.yml requirements.yml ADD pip-requirements requirements.txt ADD ansible-builder/bindep.txt bindep.txt - -RUN exec ssh-agent bash && ssh-add ~/.ssh/id_ed25519 && ansible-galaxy role install -r requirements.yml --roles-path /usr/share/ansible/roles +RUN ssh-keyscan git.dev-at.de >> /root/.ssh/known_hosts +RUN eval $(ssh-agent) && ssh-add /root/.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