UNCLASSIFIED - NO CUI

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

Merge branch '7.5.0' into 'development' 

init

See merge request dsop/confluent/confluentinc/cp-enterprise-replicator-7.2.x!32
parents 0128b3fc a738321f
No related branches found
No related tags found
2 merge requests!33Development,!32init
Pipeline #2233832 passed
Stage: .pre
Stage: lint
Stage: secret-scan
Stage: os-type
Stage: pipeline-trigger
Pipeline: cp-enterprise-replicator-7.8.x

#2233839

    Hide whitespace changes
    Inline Side-by-side
    Dockerfile
    + 11
    − 14
    View file @ 8592aeba
    ARG CP_ENTERPRISE_REPLICATOR_BASE_IMAGE=confluentinc/cp-enterprise-replicator
    ARG CP_ENTERPRISE_REPLICATOR_BASE_TAG=7.5.0
    ARG BASE_REGISTRY=registry1.dso.mil
    ARG BASE_IMAGE=confluentinc/cp-base-new
    ARG BASE_TAG=latest
    FROM ${CP_ENTERPRISE_REPLICATOR_BASE_IMAGE}:${CP_ENTERPRISE_REPLICATOR_BASE_TAG} as base
    FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
    ENV COMPONENT=kafka-connect
    ENV CONFLUENT_VERSION=7.2.4
    # This affects how strings in Java class files are interpreted.
    # We want UTF-8 and this is the only locale in the base image that supports it
    ENV LANG="C.UTF-8"
    USER root
    ......@@ -18,6 +17,8 @@ ARG KAFKA_ZOOKEEPER_CONNECT
    ENV KAFKA_ZOOKEEPER_CONNECT=${KAFKA_ZOOKEEPER_CONNECT}
    ARG KAFKA_ADVERTISED_LISTENERS
    ENV KAFKA_ADVERTISED_LISTENERS=${KAFKA_ADVERTISED_LISTENERS}
    ARG CLUSTER_ID
    ENV CLUSTER_ID=${CLUSTER_ID}
    ENV CONNECT_PLUGIN_PATH=/usr/share/java/,/usr/share/confluent-hub-components/
    ......@@ -26,7 +27,8 @@ COPY LICENSE /licenses
    COPY Dockerfile /etc/confluent/ironbank/
    COPY hardening_manifest.yaml /etc/confluent/ironbank/
    COPY --chown=appuser:appuser scripts/include/etc/confluent/docker /etc/confluent/docker
    ## copy from dockerhub image
    COPY --from=base /etc/confluent/docker /etc/confluent/docker
    # primary
    EXPOSE 9092
    ......@@ -34,9 +36,7 @@ EXPOSE 9092
    # rest
    EXPOSE 8083
    RUN echo "===> Dependency update" \
    && dnf update -y --nodocs \
    && echo "===> Installing ${COMPONENT}" \
    RUN echo "===> Installing ${COMPONENT}" \
    && dnf install -y /tmp/confluent-common-*.noarch.rpm \
    /tmp/confluent-rest-utils-*.noarch.rpm \
    /tmp/confluent-metadata-service-*.noarch.rpm \
    ......@@ -57,10 +57,7 @@ RUN echo "===> Dependency update" \
    && chown appuser:root -R /etc/${COMPONENT} /usr/logs /etc/schema-registry /usr/share/confluent-hub-components /var/log/kafka /var/log/confluent /var/lib/kafka /var/lib/zookeeper /etc/kafka/secrets \
    && chmod -R ug+w /etc/kafka /var/lib/kafka/data /etc/kafka/secrets /etc/${COMPONENT} /etc/${COMPONENT}/secrets /etc/${COMPONENT}/jars /etc/schema-registry \
    && chown -R appuser:appuser /etc/confluent \
    && echo "===> Clean up, Clean up" \
    && dnf clean all \
    && yum clean all \
    && rm -rf /tmp/* /var/cache/dnf
    && dnfupdate
    VOLUME ["/var/lib/kafka/data", "/etc/kafka/secrets", "/etc/${COMPONENT}/jars", "/etc/${COMPONENT}/secrets"]
    ......@@ -74,4 +71,4 @@ CMD ["/etc/confluent/docker/run"]
    # Retry period : 8 minutes (after which container is deemed unhealthy)
    # All settings can be overriden at run-time in Docker/Docker Compose.
    HEALTHCHECK --start-period=120s --interval=5s --timeout=10s --retries=96 \
    CMD /usr/bin/kafka-topics --version
    \ No newline at end of file
    CMD /usr/bin/kafka-topics --version
    hardening_manifest.yaml
    + 56
    − 51
    View file @ 8592aeba
    ......@@ -6,14 +6,17 @@ name: "confluentinc/cp-enterprise-replicator"
    # The most specific version should be the first tag and will be shown
    # on ironbank.dso.mil
    tags:
    - "7.2.4-1-ubi8"
    - "7.2.4"
    - "7.2.x"
    - "7.2"
    - "7.5.0-1-ubi8"
    - "7.5.0"
    - "7.5.x"
    - "7.5"
    # Build args passed to Dockerfile ARGs
    args:
    CP_ENTERPRISE_REPLICATOR_BASE_IMAGE: "confluentinc/cp-enterprise-replicator"
    CP_ENTERPRISE_REPLICATOR_SERVER_BASE_TAG: "7.5.0"
    BASE_IMAGE: "confluentinc/cp-base-new"
    BASE_TAG: "Q4_2022"
    BASE_TAG: "Q2_2023"
    CONFLUENT_VERSION: "7.5.0"
    # Docker image labels
    labels:
    org.opencontainers.image.title: "cp-enterprise-replicator"
    ......@@ -21,86 +24,88 @@ labels:
    org.opencontainers.image.licenses: "CONFLUENT ENTERPRISE LICENSE"
    org.opencontainers.image.url: "https://docs.confluent.io/platform/current/overview.html"
    org.opencontainers.image.vendor: "Confluent"
    org.opencontainers.image.version: "7.2.4"
    org.opencontainers.image.version: "7.5.0"
    mil.dso.ironbank.image.keywords: "confluent,cflt,kafka,replicator,operator,cfk"
    mil.dso.ironbank.image.type: "commercial"
    mil.dso.ironbank.product.name: "Confluent Platform"
    resources:
    - filename: confluent-common-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-common-7.2.4-1.noarch.rpm
    - tag: confluentinc/cp-enterprise-replicator:7.5.0
    url: docker://docker.io/confluentinc/cp-enterprise-replicator:7.5.0
    - filename: confluent-common-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-common-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: 137d8ce34b8723cdf27dc75a65dea5629b8470f04dfa853dd26e8f14c1707e86
    - filename: confluent-rebalancer-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-rebalancer-7.2.4-1.noarch.rpm
    value: 3abc7cda618d71c051d38a3b035fbc9c3275c24e58a8a2ffd1ea8d8895951f38
    - filename: confluent-rebalancer-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-rebalancer-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: f0ec6f0267cf00cc159ed5d0adead36eb752590f659535abdc71d6cba35f9220
    - filename: confluent-rest-utils-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-rest-utils-7.2.4-1.noarch.rpm
    value: cf5062a10fc5a89f2aa7ff1b84915129ecb949e240062c0fac5c434551026d94
    - filename: confluent-rest-utils-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-rest-utils-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: 93b4dc2b07e003871719cce60bfdcf604eeb76ee7e2593d74165c8d112008aef
    - filename: confluent-security-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-security-7.2.4-1.noarch.rpm
    value: 710316b8f85d9fbbb65a283a517545f5b907d5619f8e531ab86835a5868b0704
    - filename: confluent-security-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-security-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: 4a1cd073b17959176829b1c858831ee01750c361d229dedbbf28a29a0b212ed8
    - filename: confluent-metadata-service-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-metadata-service-7.2.4-1.noarch.rpm
    value: 74a091585788db1d27f86575118429f04c32662a75db21c384143c4bafcaab8c
    - filename: confluent-metadata-service-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-metadata-service-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: c952a830d5a593a36cc2e6920a74abb9f2b320866ea032b786a560fde53083f1
    - filename: confluent-server-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-server-7.2.4-1.noarch.rpm
    value: 6fddf2229c946869e457d82969960b3ff4fb1193d4156cc2df3365ed6c468b3b
    - filename: confluent-server-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-server-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: 80da21292a3e849770c9c988764ab4cb73db45a95102abe26d8ed3ce123846cd
    - filename: confluent-ce-kafka-http-server-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-ce-kafka-http-server-7.2.4-1.noarch.rpm
    value: 62a63150c8c18d40af4d49f2fa6847fccc9607c202745422e7e54c2a1b098545
    - filename: confluent-ce-kafka-http-server-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-ce-kafka-http-server-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: 602a6af6e64c1eedaceef34e3cc5e67c89bebe66a3052b9203436273669d1c3a
    - filename: confluent-server-rest-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-server-rest-7.2.4-1.noarch.rpm
    value: e04b5cce8df06ab9dbbeee51efa2d03b4586bef97b2b9d9520e8a999df35c0e1
    - filename: confluent-server-rest-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-server-rest-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: e120b754691951e806a8b629d3bd37fa25b36003fa210736a0dcc3ba6e1f4900
    - filename: confluent-telemetry-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-telemetry-7.2.4-1.noarch.rpm
    value: 40247e2e1628efc0f6637cbfbe4236cbd711c9c890b41cf7e27f20bac7d3955a
    - filename: confluent-telemetry-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-telemetry-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: 0de6b92c4ae1dfa0199106f0b1b62503c601bd29402abadf1f877b821032f96d
    - filename: confluent-kafka-rest-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-kafka-rest-7.2.4-1.noarch.rpm
    value: d3ec0b0451596de2801b96c88f579386c5fe0bb11573539e3f3b39ba261f969d
    - filename: confluent-kafka-rest-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-kafka-rest-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: f8548eb98d3adbe7a2dcc7dd97759b8de7d99c74af590320215ff44f76c1b0f9
    - filename: confluent-hub-client-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-hub-client-7.2.4-1.noarch.rpm
    value: 22e65ff56e13a39803986b1e41cdbd8f627885432f46e2241359e271fe0866cf
    - filename: confluent-hub-client-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-hub-client-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: c2a727f893fd3c4cd4e9b8d96cdde055469baa87d3400b6cee68cddfa4667bbd
    - filename: confluent-control-center-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-control-center-7.2.4-1.noarch.rpm
    value: 333f7a7e78739d7b03eb5ff157dff521bfeb8189321d086491715c735ae2efba
    - filename: confluent-control-center-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-control-center-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: 6c09e1d2a9ea485f66f37c696a94dfc91d7465839bd1723215e5f30a89121ee2
    - filename: confluent-control-center-fe-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-control-center-fe-7.2.4-1.noarch.rpm
    value: 1442003320ff3c948954a094ff27c0e4a3e3131e6ee3f82314b8d9ceddbd856b
    - filename: confluent-control-center-fe-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-control-center-fe-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: d75efef23a47efefd889ac68b61f886fc7f043772a3937628bb48467f2cee967
    - filename: confluent-schema-registry-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-schema-registry-7.2.4-1.noarch.rpm
    value: dc9dbb683c02a37f73359f6866c697b03c479ab0e14daee5af2a16d85188eb8f
    - filename: confluent-schema-registry-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-schema-registry-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: cbfb4f5764dc199a909d6f887086e5f7ec679fbbf397945c1168caad0d7c386e
    - filename: confluent-kafka-connect-replicator-7.2.4-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.2/confluent-kafka-connect-replicator-7.2.4-1.noarch.rpm
    value: 436489f27eb606a87da2230bfc3796d0e8672250d2dd7aada7cc471fbf2a7270
    - filename: confluent-kafka-connect-replicator-7.5.0-1.noarch.rpm
    url: https://packages.confluent.io/rpm/7.5/confluent-kafka-connect-replicator-7.5.0-1.noarch.rpm
    validation:
    type: sha256
    value: 95c20f5d479461d7e6a9b55107cc354a607626c1dabf29071daf79ceb2268277
    value: 47f47a1c1c6799fbf927022de0951a48eaa3539343245661f8b9d342ea5d9d23
    # List of project maintainers
    maintainers:
    - name: "Scott Stroud"
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment

    UNCLASSIFIED - NO CUI