jonny/awx-ee-custom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added helm

Browse Source
This commit is contained in:
Jon Ervine 2021-05-21 14:01:36 +08:00
parent 8926cd87d4
commit 770c291708
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Containerfile
View File

@ -8,7 +8,7 @@ ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS=
ADD _build /build ADD _build /build
WORKDIR /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 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 FROM $PYTHON_BUILDER_IMAGE as builder
@ -23,10 +23,12 @@ COPY --from=galaxy /usr/share/ansible /usr/share/ansible
COPY --from=builder /output/ /output/ COPY --from=builder /output/ /output/
RUN /output/install-from-bindep && rm -rf /output/wheels 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 COPY --from=receptor /usr/bin/receptor /usr/bin/receptor
RUN mkdir -p /var/run/receptor RUN mkdir -p /var/run/receptor
ADD run.sh /run.sh ADD run.sh /run.sh
CMD /run.sh CMD /run.sh
USER ansible USER 1000
RUN git lfs install RUN git lfs install

4
Containerfile.1
View File

@ -14,7 +14,7 @@ FROM $ANSIBLE_RUNNER_IMAGE
COPY --from=galaxy /usr/share/ansible /usr/share/ansible 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 CMD /run.sh
USER ansible USER 1000
RUN git lfs install RUN git lfs install

1
_build/requirements_combined.txt
View File

@ -57,3 +57,4 @@ requests-oauthlib # from collection kubernetes.core
openstacksdk>=0.13 # from collection openstack.cloud openstacksdk>=0.13 # from collection openstack.cloud
ovirt-engine-sdk-python>=4.4.10 # from collection ovirt.ovirt ovirt-engine-sdk-python>=4.4.10 # from collection ovirt.ovirt
ipaddress # from collection theforeman.foreman ipaddress # from collection theforeman.foreman
hvac # from community.general