modified eda container yml
This commit is contained in:
parent
b2df07a9b3
commit
11a4826834
@ -1,5 +1,6 @@
|
|||||||
ARG EE_BASE_IMAGE="registry.redhat.io/ansible-automation-platform-25/de-supported-rhel8:latest"
|
ARG EE_BASE_IMAGE="registry.redhat.io/ansible-automation-platform-25/de-minimal-rhel9:latest"
|
||||||
ARG PYCMD="/usr/bin/python3"
|
ARG PYCMD="/usr/bin/python3"
|
||||||
|
ARG PYPKG="python39"
|
||||||
ARG PKGMGR_PRESERVE_CACHE=""
|
ARG PKGMGR_PRESERVE_CACHE=""
|
||||||
ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS=""
|
ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS=""
|
||||||
ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS=""
|
ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS=""
|
||||||
@ -11,6 +12,7 @@ USER root
|
|||||||
ENV PIP_BREAK_SYSTEM_PACKAGES=1
|
ENV PIP_BREAK_SYSTEM_PACKAGES=1
|
||||||
ARG EE_BASE_IMAGE
|
ARG EE_BASE_IMAGE
|
||||||
ARG PYCMD
|
ARG PYCMD
|
||||||
|
ARG PYPKG
|
||||||
ARG PKGMGR_PRESERVE_CACHE
|
ARG PKGMGR_PRESERVE_CACHE
|
||||||
ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS
|
ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS
|
||||||
ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS
|
ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS
|
||||||
@ -18,27 +20,19 @@ ARG PKGMGR
|
|||||||
|
|
||||||
COPY _build/scripts/ /output/scripts/
|
COPY _build/scripts/ /output/scripts/
|
||||||
COPY _build/scripts/entrypoint /opt/builder/bin/entrypoint
|
COPY _build/scripts/entrypoint /opt/builder/bin/entrypoint
|
||||||
RUN echo This is a prepend base command!
|
RUN $PKGMGR install $PYPKG -y ; if [ -z $PKGMGR_PRESERVE_CACHE ]; then $PKGMGR clean all; fi
|
||||||
RUN /output/scripts/pip_install $PYCMD
|
RUN /output/scripts/pip_install $PYCMD
|
||||||
|
|
||||||
# Galaxy build stage
|
# Galaxy build stage
|
||||||
FROM base as galaxy
|
FROM base as galaxy
|
||||||
ARG EE_BASE_IMAGE
|
ARG EE_BASE_IMAGE
|
||||||
ARG PYCMD
|
ARG PYCMD
|
||||||
|
ARG PYPKG
|
||||||
ARG PKGMGR_PRESERVE_CACHE
|
ARG PKGMGR_PRESERVE_CACHE
|
||||||
ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS
|
ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS
|
||||||
ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS
|
ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS
|
||||||
ARG PKGMGR
|
ARG PKGMGR
|
||||||
|
|
||||||
COPY _build/configs/ansible.cfg /etc/ansible/ansible.cfg
|
|
||||||
ENV ANSIBLE_GALAXY_SERVER_LIST='certified, validated, community_galaxy'
|
|
||||||
ENV ANSIBLE_GALAXY_SERVER_CERTIFIED_URL=https://console.redhat.com/api/automation-hub/content/published/
|
|
||||||
ENV ANSIBLE_GALAXY_SERVER_CERTIFIED_AUTH_URL=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
|
|
||||||
ENV ANSIBLE_GALAXY_SERVER_VALIDATED_URL=https://console.redhat.com/api/automation-hub/content/validated/
|
|
||||||
ENV ANSIBLE_GALAXY_SERVER_VALIDATED_AUTH_URL=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
|
|
||||||
ENV ANSIBLE_GALAXY_SERVER_COMMUNITY_GALAXY_URL=https://galaxy.ansible.com/
|
|
||||||
ARG ANSIBLE_GALAXY_SERVER_CERTIFIED_TOKEN
|
|
||||||
ARG ANSIBLE_GALAXY_SERVER_VALIDATED_TOKEN
|
|
||||||
RUN /output/scripts/check_galaxy
|
RUN /output/scripts/check_galaxy
|
||||||
COPY _build /build
|
COPY _build /build
|
||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
@ -53,6 +47,7 @@ ENV PIP_BREAK_SYSTEM_PACKAGES=1
|
|||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
ARG EE_BASE_IMAGE
|
ARG EE_BASE_IMAGE
|
||||||
ARG PYCMD
|
ARG PYCMD
|
||||||
|
ARG PYPKG
|
||||||
ARG PKGMGR_PRESERVE_CACHE
|
ARG PKGMGR_PRESERVE_CACHE
|
||||||
ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS
|
ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS
|
||||||
ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS
|
ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS
|
||||||
@ -72,6 +67,7 @@ FROM base as final
|
|||||||
ENV PIP_BREAK_SYSTEM_PACKAGES=1
|
ENV PIP_BREAK_SYSTEM_PACKAGES=1
|
||||||
ARG EE_BASE_IMAGE
|
ARG EE_BASE_IMAGE
|
||||||
ARG PYCMD
|
ARG PYCMD
|
||||||
|
ARG PYPKG
|
||||||
ARG PKGMGR_PRESERVE_CACHE
|
ARG PKGMGR_PRESERVE_CACHE
|
||||||
ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS
|
ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS
|
||||||
ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS
|
ARG ANSIBLE_GALAXY_CLI_ROLE_OPTS
|
||||||
|
|||||||
@ -1,5 +1,2 @@
|
|||||||
collections:
|
collections:
|
||||||
- name: ansible.eda
|
- name: ansible.eda
|
||||||
- name: community.general
|
|
||||||
- name: redhat.insights_eda
|
|
||||||
- name: servicenow.itsm
|
|
||||||
|
|||||||
@ -3,39 +3,14 @@ version: 3
|
|||||||
|
|
||||||
images:
|
images:
|
||||||
base_image:
|
base_image:
|
||||||
name: registry.redhat.io/ansible-automation-platform-25/de-supported-rhel8:latest
|
name: 'registry.redhat.io/ansible-automation-platform-25/de-minimal-rhel9:latest'
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
galaxy:
|
galaxy:
|
||||||
collections:
|
collections:
|
||||||
- name: ansible.eda
|
- name: ansible.eda
|
||||||
- name: community.general
|
python_interpreter:
|
||||||
- name: redhat.insights_eda
|
package_system: "python39"
|
||||||
- name: servicenow.itsm
|
|
||||||
system: bindep-eda.txt
|
|
||||||
|
|
||||||
additional_build_files:
|
|
||||||
- src: ansible.cfg
|
|
||||||
dest: configs
|
|
||||||
|
|
||||||
options:
|
options:
|
||||||
package_manager_path: /usr/bin/microdnf
|
package_manager_path: /usr/bin/microdnf
|
||||||
|
|
||||||
additional_build_steps:
|
|
||||||
prepend_base:
|
|
||||||
- RUN echo This is a prepend base command!
|
|
||||||
|
|
||||||
prepend_galaxy:
|
|
||||||
- COPY _build/configs/ansible.cfg /etc/ansible/ansible.cfg
|
|
||||||
- ENV ANSIBLE_GALAXY_SERVER_LIST='certified, validated, community_galaxy'
|
|
||||||
- ENV ANSIBLE_GALAXY_SERVER_CERTIFIED_URL=https://console.redhat.com/api/automation-hub/content/published/
|
|
||||||
- ENV ANSIBLE_GALAXY_SERVER_CERTIFIED_AUTH_URL=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
|
|
||||||
- ENV ANSIBLE_GALAXY_SERVER_VALIDATED_URL=https://console.redhat.com/api/automation-hub/content/validated/
|
|
||||||
- ENV ANSIBLE_GALAXY_SERVER_VALIDATED_AUTH_URL=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
|
|
||||||
- ENV ANSIBLE_GALAXY_SERVER_COMMUNITY_GALAXY_URL=https://galaxy.ansible.com/
|
|
||||||
# Update environment variables with new token values to regenerate the execution environment
|
|
||||||
# Token can be generated at https://console.redhat.com/ansible/automation-hub/token
|
|
||||||
# Pass both ARGs into Ansible-Builder
|
|
||||||
- ARG ANSIBLE_GALAXY_SERVER_CERTIFIED_TOKEN
|
|
||||||
- ARG ANSIBLE_GALAXY_SERVER_VALIDATED_TOKEN
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user