UNCLASSIFIED

Commit 9b5fcfea authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch '5.5.3' into 'development'

5.5.3 port

See merge request !5
parents e83a82c8 6a1e97c6
Pipeline #185109 passed with stages
in 20 minutes and 56 seconds
ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=confluentinc/cp-server-connect
ARG BASE_TAG=5.5.2
ARG BASE_TAG=5.5.3
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
USER root
......@@ -16,21 +16,18 @@ ENV COMPONENT_SCRIPT_DIR=/opt/confluent/etc
WORKDIR /opt
## Copy dependencies
ADD operator-5.5.2-caas_lib.tar.gz /opt/caas/lib/
ADD operator-5.5.2-plugins.tar.gz /usr/share/java/cc-base/
ADD cp-server-connect-operator-5.5.2_caas.tar.gz /opt/caas/
RUN mkdir -p /usr/share/java/cc-base /opt/caas
COPY operator-5.5.3-plugins.tar.gz /usr/share/java/cc-base/
COPY cp-server-connect-operator-5.5.3_caas.tar.gz /opt/caas/
RUN yum install -y openssl findutils && yum clean all && mkdir -p "${CONNECT_LOG4J_DIR}" "${CONNECT_SECRETS_DIR}" "${CONNECT_CONFIG_DIR}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}/jars" \
RUN cd /usr/share/java/cc-base && tar -xvf operator-5.5.3-plugins.tar.gz && rm operator-5.5.3-plugins.tar.gz \
&& cd /opt/caas && tar -xvf cp-server-connect-operator-5.5.3_caas.tar.gz && rm cp-server-connect-operator-5.5.3_caas.tar.gz \
&& yum install -y openssl findutils && yum clean all && mkdir -p "${CONNECT_LOG4J_DIR}" "${CONNECT_SECRETS_DIR}" "${CONNECT_CONFIG_DIR}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}/jars" \
&& chmod -R ag+w "${CONNECT_LOG4J_DIR}" "${CONNECT_SECRETS_DIR}" "${CONNECT_CONFIG_DIR}" "/opt"
CMD ["/opt/caas/bin/run"]
# Polling period : 5 seconds
# Timeout period :10 seconds (if the polling does not return within this time, treat as a failed poll)
# Start-up period :10 minutes (during which failures are not counted as failures)
# Retry period :30 seconds (after which container is deemed unhealthy)
# All settings can be overriden at run-time in Docker/Docker Compose.
HEALTHCHECK --start-period=600s --interval=5s --timeout=10s --retries=6 \
CMD /etc/confluent/docker/healthcheck.sh
HEALTHCHECK --start-period=120s --interval=5s --timeout=10s --retries=96 \
CMD /opt/caas/bin/ensure
USER 1001
\ No newline at end of file
......@@ -8,44 +8,39 @@ name: "confluent/confluent-component-operator/cp-server-connect-operator-5.5.x"
# The most specific version should be the first tag and will be shown
# on ironbank.dsop.io
tags:
- "5.5.2"
- "5.5.3"
- "5.5.x"
- "5.5"
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "redhat/openjdk/openjdk11"
BASE_TAG: "1.11"
BASE_IMAGE: "confluent/kafka-connect/cp-server-connect-5.5.x"
BASE_TAG: "5.5.3"
# Docker image labels
labels:
org.opencontainers.image.title: "cp-server-connect-operator-5.5.x"
org.opencontainers.image.description: "Confluent Operator image for cp-server-connect."
org.opencontainers.image.licenses: "CONFLUENT ENTERPRISE LICENSE"
org.opencontainers.image.url: "https://docs.confluent.io/5.5.2/installation/operator/index.html"
org.opencontainers.image.url: "https://docs.confluent.io/5.5.3/installation/operator/index.html"
org.opencontainers.image.vendor: "Confluent"
org.opencontainers.image.version: "5.5.2"
org.opencontainers.image.version: "5.5.3"
mil.dso.ironbank.image.keywords: "confluent,kafka,zookeeper,operator"
mil.dso.ironbank.image.type: "commercial"
mil.dso.ironbank.product.name: "Confluent Platform"
# List of resources to make available to the offline build context
resources:
- filename: operator-5.5.2-plugins.tar.gz
url: https://ironbank-files.s3.amazonaws.com/operator-5.5.2-plugins.tar.gz
- filename: operator-5.5.3-plugins.tar.gz
url: https://ironbank-files.s3.amazonaws.com/operator-5.5.3-plugins.tar.gz
validation:
type: sha256
value: 37adbede99aeaf765a9cc16ecdf0b0616f564ddd2cd7364540b186f222edc54d
- filename: operator-5.5.2-caas_lib.tar.gz
url: https://ironbank-files.s3.amazonaws.com/operator-5.5.2-caas_lib.tar.gz
validation:
type: sha256
value: 11112ceb5f4ad55956b4cd631be598acaec7fe754baec52d454ab4bd6222769e
- filename: cp-server-connect-operator-5.5.2_caas.tar.gz
url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.2_caas.tar.gz
value: 28023c40fa06e695f97a5942b74663a6ce397edb78c5376dae14addb01355a80
- filename: cp-server-connect-operator-5.5.3_caas.tar.gz
url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.3_caas.tar.gz
validation:
type: sha256
value: 874f5662daa9a49e1d2c7f0a70b13595e8370392c3f0d8afc3b872414d4f24cc
value: b6557abd57ad4b05d4b9f6f1c964250be80a6f9db11420ade8d739d340e77c59
# List of project maintainers
maintainers:
......
Markdown is supported
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