UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 45a0d8e8 authored by Colton Freeman's avatar Colton Freeman :fingers_crossed:
Browse files

Merge branch '101223_App_Update' into 'development'

101223_App_Update

See merge request dsop/confluent/confluentinc/confluent-operator-2.6.x!18
parents c8b57dee 56c57f50
No related branches found
No related tags found
2 merge requests!19Development,!18101223_App_Update
Pipeline #2333635 passed
Pipeline: confluent-operator-2.9.x

#2333638

    ......@@ -21,7 +21,6 @@ COPY hardening_manifest.yaml /etc/confluent/ironbank/
    ## copy from dockerhub image
    COPY --from=base /licenses /licenses
    COPY --from=base /opt/manager /opt/manager
    COPY scripts/entrypoint.sh /entrypoint.sh
    RUN echo "===> Dependency update" \
    ......@@ -32,7 +31,7 @@ RUN echo "===> Dependency update" \
    && yum clean all \
    && rm -rf /tmp/* /var/cache/dnf
    ENTRYPOINT ["/entrypoint.sh"]
    ENTRYPOINT ["/opt/manager"]
    # Polling period : 5 seconds
    # Timeout period : 2 seconds (if the polling does not return within this time, treat as a failed poll)
    ......@@ -41,4 +40,4 @@ ENTRYPOINT ["/entrypoint.sh"]
    HEALTHCHECK --interval=5s --timeout=2s --retries=5 \
    CMD curl --fail --silent --output /dev/null http://localhost:8080/readyz || exit 1
    USER 1001
    \ No newline at end of file
    USER 1001
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment