diff --git a/tealc-ee/context/Dockerfile b/tealc-ee/context/Dockerfile index c06b8822..59094f43 100644 --- a/tealc-ee/context/Dockerfile +++ b/tealc-ee/context/Dockerfile @@ -77,8 +77,8 @@ COPY --from=galaxy /usr/share/ansible /usr/share/ansible COPY --from=builder /output/ /output/ RUN /output/scripts/install-from-bindep && rm -rf /output/wheels RUN chmod ug+rw /etc/passwd -RUN mkdir -p /runner && chgrp 0 /runner && chmod -R ug+rwx /runner -WORKDIR /runner +RUN mkdir -p /build && chgrp 0 /build && chmod -R ug+rwx /build +WORKDIR /build RUN $PYCMD -m pip install --no-cache-dir 'dumb-init==1.2.5' RUN echo This is a post-install command! RUN curl https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-linux.tar.gz -o openshift-client-linux.tar.gz && tar xzf openshift-client-linux.tar.gz && rm -f openshift-client-linux.tar.gz && mv oc /usr/bin/oc && mv kubectl /usr/bin/kubectl @@ -86,6 +86,6 @@ RUN /usr/bin/dnf install -y https://kojipkgs.fedoraproject.org//packages/git-cry RUN curl -O https://mirror.openshift.com/pub/rhacs/assets/4.2.0/bin/Linux/roxctl && chmod +x roxctl && mv roxctl /usr/bin/roxctl RUN rm -rf /output LABEL ansible-execution-environment=true -USER 1000 +USER root ENTRYPOINT ["/opt/builder/bin/entrypoint", "dumb-init"] CMD ["bash"] diff --git a/tealc-ee/execution-environment.yml b/tealc-ee/execution-environment.yml index 0e319021..2b58fbc7 100644 --- a/tealc-ee/execution-environment.yml +++ b/tealc-ee/execution-environment.yml @@ -27,3 +27,7 @@ additional_build_steps: - RUN curl https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-linux.tar.gz -o openshift-client-linux.tar.gz && tar xzf openshift-client-linux.tar.gz && rm -f openshift-client-linux.tar.gz && mv oc /usr/bin/oc && mv kubectl /usr/bin/kubectl - RUN /usr/bin/dnf install -y https://kojipkgs.fedoraproject.org//packages/git-crypt/0.6.0/7.el8/x86_64/git-crypt-0.6.0-7.el8.x86_64.rpm - RUN curl -O https://mirror.openshift.com/pub/rhacs/assets/4.2.0/bin/Linux/roxctl && chmod +x roxctl && mv roxctl /usr/bin/roxctl + +options: + workdir: /build + user: root \ No newline at end of file