From 770c29170879a5eace759d1a43fc708d2a7a2738 Mon Sep 17 00:00:00 2001 From: Jon Ervine Date: Fri, 21 May 2021 14:01:36 +0800 Subject: [PATCH] Added helm --- Containerfile | 8 +++++--- Containerfile.1 | 4 ++-- _build/requirements_combined.txt | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Containerfile b/Containerfile index 19bcf71..36dd657 100644 --- a/Containerfile +++ b/Containerfile @@ -8,7 +8,7 @@ ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS= ADD _build /build WORKDIR /build -RUN useradd -c "Ansible User" -M -u 1000 ansible && ansible-galaxy role install -r requirements.yml --roles-path /usr/share/ansible/roles +RUN 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 $PYTHON_BUILDER_IMAGE as builder @@ -23,10 +23,12 @@ COPY --from=galaxy /usr/share/ansible /usr/share/ansible COPY --from=builder /output/ /output/ RUN /output/install-from-bindep && rm -rf /output/wheels -RUN alternatives --set python /usr/bin/python3 && useradd -c "Ansible User" -M -u 1000 ansible +RUN alternatives --set python /usr/bin/python3 && \ + curl -L https://get.helm.sh/helm-v3.5.4-linux-amd64.tar.gz -o /tmp/helm.tgz && \ + tar -zxvf /tmp/helm.tgz --strip-components=1 -C /usr/local/bin linux-amd64/helm COPY --from=receptor /usr/bin/receptor /usr/bin/receptor RUN mkdir -p /var/run/receptor ADD run.sh /run.sh CMD /run.sh -USER ansible +USER 1000 RUN git lfs install diff --git a/Containerfile.1 b/Containerfile.1 index 6463633..2430cf9 100644 --- a/Containerfile.1 +++ b/Containerfile.1 @@ -14,7 +14,7 @@ FROM $ANSIBLE_RUNNER_IMAGE COPY --from=galaxy /usr/share/ansible /usr/share/ansible -RUN alternatives --set python /usr/bin/python3 && useradd -c "Ansible User" -M -u 1000 ansible +RUN alternatives --set python /usr/bin/python3 CMD /run.sh -USER ansible +USER 1000 RUN git lfs install diff --git a/_build/requirements_combined.txt b/_build/requirements_combined.txt index f42695e..641eb52 100644 --- a/_build/requirements_combined.txt +++ b/_build/requirements_combined.txt @@ -56,4 +56,5 @@ openshift>=0.6.2 # from collection kubernetes.core requests-oauthlib # from collection kubernetes.core openstacksdk>=0.13 # from collection openstack.cloud ovirt-engine-sdk-python>=4.4.10 # from collection ovirt.ovirt -ipaddress # from collection theforeman.foreman \ No newline at end of file +ipaddress # from collection theforeman.foreman +hvac # from community.general