UNCLASSIFIED

Skip to content

GitLab

Commit 127f13ac authored by alexander.klepal's avatar alexander.klepal
Browse files

Merge branch '5.5.4' into 'development' 

5.5.4 to dev MR

See merge request !5
parents c8652371 2970b506
Pipeline #341360 failed with stages
in 1 minute and 4 seconds
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 215 deletions
.gitignore 0 → 100644
View file @ 127f13ac
*.whl
*.tar.gz
*.rpm
build-image.sh
Dockerfile
View file @ 127f13ac
...@@ -27,11 +27,10 @@ USER root ...@@ -27,11 +27,10 @@ USER root
######################################## ########################################
## Install Python ## Install Python
RUN dnf update -y && \ RUN dnf update -y \
dnf install -y python38.x86_64 && \ && dnf install -y python38.x86_64 python38-pip-wheel.noarch openssl tar procps iputils hostname \
dnf install -y python38-pip-wheel.noarch && \ && dnf clean all \
dnf clean all && \ && rm -rf /var/cache/dnf
rm -rf /var/cache/dnf
## Python Installed ## Python Installed
######################################## ########################################
...@@ -41,49 +40,45 @@ RUN dnf update -y && \ ...@@ -41,49 +40,45 @@ RUN dnf update -y && \
## Add the Confluent Docker Utility Belt which helps with starting the proper applications ## Add the Confluent Docker Utility Belt which helps with starting the proper applications
## https://github.com/confluentinc/common-docker/tree/master/utility-belt ## https://github.com/confluentinc/common-docker/tree/master/utility-belt
COPY wheel-0.35.1-py2.py3-none-any.whl /tmp/wheel-0.35.1-py2.py3-none-any.whl COPY confluent_docker_utils-0.0.44-py3-none-any.whl /tmp/confluent_docker_utils-0.0.44-py3-none-any.whl
COPY python_dateutil-2.8.0-py2.py3-none-any.whl /tmp/python_dateutil-2.8.0-py2.py3-none-any.whl
COPY setuptools-50.0.0-py3-none-any.whl /tmp/setuptools-50.0.0-py3-none-any.whl
COPY confluent_docker_utils-0.0.40-py3-none-any.whl /tmp/confluent_docker_utils-0.0.40-py3-none-any.whl
COPY *.whl /tmp/python-dependencies/ COPY *.whl /tmp/python-dependencies/
COPY *.gz /tmp/python-dependencies/ COPY *.gz /tmp/python-dependencies/
RUN dnf install -y openssl tar procps iputils hostname \ RUN pip3 install --no-index --prefix=/usr/local --upgrade --find-links /tmp/python-dependencies/ /tmp/confluent_docker_utils-0.0.44-py3-none-any.whl
&& pip3 install --no-index --prefix=/usr/local --upgrade --find-links /tmp/python-dependencies/ /tmp/wheel-0.35.1-py2.py3-none-any.whl \
&& pip3 install --no-index --prefix=/usr/local --upgrade --find-links /tmp/python-dependencies/ /tmp/setuptools-50.0.0-py3-none-any.whl \
&& pip3 install --no-index --prefix=/usr/local --upgrade --find-links /tmp/python-dependencies/ /tmp/python_dateutil-2.8.0-py2.py3-none-any.whl \
&& pip3 install --no-index --prefix=/usr/local --upgrade --find-links /tmp/python-dependencies/ /tmp/confluent_docker_utils-0.0.40-py3-none-any.whl
## dub installed ## dub installed
######################################## ########################################
RUN mkdir -p /etc/confluent/docker /usr/logs /licenses \ RUN mkdir -p /etc/confluent/docker /usr/logs /licenses \
&& useradd --no-log-init --create-home --shell /bin/bash appuser && useradd --no-log-init --create-home --shell /bin/bash appuser
COPY --chown=appuser:appuser cp-base-new-5.5.2_doc.tar.gz /usr/share/doc/cp-base-new/ COPY --chown=appuser:appuser cp-base-new-5.5.4_doc.tar.gz /usr/share/doc/cp-base-new/
COPY --chown=appuser:appuser cp-base-new-5.5.3_java.tar.gz /usr/share/java/cp-base-new/ COPY --chown=appuser:appuser cp-base-new-5.5.4_java.tar.gz /usr/share/java/cp-base-new/
COPY --chown=appuser:appuser scripts/etc/confluent/docker /etc/confluent/docker COPY --chown=appuser:appuser scripts/etc/confluent/docker /etc/confluent/docker
COPY license.txt /licenses COPY license.txt /licenses
RUN chown appuser:appuser -R /etc/confluent/ /usr/logs \ RUN chown appuser:appuser -R /etc/confluent/ /usr/logs \
&& cd /usr/share/doc/cp-base-new/ && tar -xvf cp-base-new-5.5.2_doc.tar.gz && rm cp-base-new-5.5.2_doc.tar.gz \ && cd /usr/share/doc/cp-base-new/ && tar -xvf cp-base-new-5.5.4_doc.tar.gz && rm cp-base-new-5.5.4_doc.tar.gz \
&& cd /usr/share/java/cp-base-new/ && tar -xvf cp-base-new-5.5.3_java.tar.gz && rm cp-base-new-5.5.3_java.tar.gz && cd /usr/share/java/cp-base-new/ && tar -xvf cp-base-new-5.5.4_java.tar.gz && rm cp-base-new-5.5.4_java.tar.gz
# Set the classpath for JARs required by `cub`
ENV CUB_CLASSPATH='"/usr/share/java/cp-base-new/*"'
############ ^^^^^ Base Container Details ^^^^^ ############ ############ ^^^^^ Base Container Details ^^^^^ ############
############################################################ ############################################################
############ vvvvv This Container Below vvvvv ############ ############ vvvvv This Container Below vvvvv ############
# Copy required RPMs # Copy required RPMs
COPY confluent-common-5.5.3-1.noarch.rpm /tmp/ COPY confluent-common-5.5.4-1.noarch.rpm /tmp/
COPY confluent-control-center-5.5.3-1.noarch.rpm /tmp/ COPY confluent-control-center-5.5.4-1.noarch.rpm /tmp/
COPY confluent-control-center-fe-5.5.3-1.noarch.rpm /tmp/ COPY confluent-control-center-fe-5.5.4-1.noarch.rpm /tmp/
COPY confluent-hub-client-5.5.3-1.noarch.rpm /tmp/ COPY confluent-hub-client-5.5.4-1.noarch.rpm /tmp/
COPY confluent-kafka-connect-replicator-5.5.3-1.noarch.rpm /tmp/ COPY confluent-kafka-connect-replicator-5.5.4-1.noarch.rpm /tmp/
COPY confluent-metadata-service-5.5.3-1.noarch.rpm /tmp/ COPY confluent-metadata-service-5.5.4-1.noarch.rpm /tmp/
COPY confluent-rebalancer-5.5.3-1.noarch.rpm /tmp/ COPY confluent-rebalancer-5.5.4-1.noarch.rpm /tmp/
COPY confluent-rest-utils-5.5.3-1.noarch.rpm /tmp/ COPY confluent-rest-utils-5.5.4-1.noarch.rpm /tmp/
COPY confluent-schema-registry-5.5.3-1.noarch.rpm /tmp/ COPY confluent-schema-registry-5.5.4-1.noarch.rpm /tmp/
COPY confluent-security-5.5.3-1.noarch.rpm /tmp/ COPY confluent-security-5.5.4-1.noarch.rpm /tmp/
COPY confluent-server-5.5.3-1.noarch.rpm /tmp/ COPY confluent-server-5.5.4-1.noarch.rpm /tmp/
######################################## ########################################
# confluentinc/kafka-images/server # confluentinc/kafka-images/server
...@@ -100,14 +95,14 @@ EXPOSE 9092 ...@@ -100,14 +95,14 @@ EXPOSE 9092
USER root USER root
RUN echo "===> Installing kafka" \ RUN echo "===> Installing kafka" \
&& dnf install --nogpgcheck -y /tmp/confluent-common-5.5.3-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-common-5.5.4-1.noarch.rpm \
&& dnf install --nogpgcheck -y /tmp/confluent-rest-utils-5.5.3-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-rest-utils-5.5.4-1.noarch.rpm \
&& dnf install --nogpgcheck -y /tmp/confluent-metadata-service-5.5.3-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-metadata-service-5.5.4-1.noarch.rpm \
&& dnf install --nogpgcheck -y /tmp/confluent-server-5.5.3-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-server-5.5.4-1.noarch.rpm \
&& echo "===> installing confluent-rebalancer ..." \ && echo "===> installing confluent-rebalancer ..." \
&& dnf install --nogpgcheck -y /tmp/confluent-rebalancer-5.5.3-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-rebalancer-5.5.4-1.noarch.rpm \
&& echo "===> installing confluent-security ..." \ && echo "===> installing confluent-security ..." \
&& dnf install --nogpgcheck -y /tmp/confluent-security-5.5.3-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-security-5.5.4-1.noarch.rpm \
&& echo "===> Setting up kafka dirs" \ && echo "===> Setting up kafka dirs" \
&& mkdir -p /var/lib/kafka/data /etc/kafka/secrets \ && mkdir -p /var/lib/kafka/data /etc/kafka/secrets \
&& chmod -R ag+w /etc/kafka /var/lib/kafka/data /etc/kafka/secrets \ && chmod -R ag+w /etc/kafka /var/lib/kafka/data /etc/kafka/secrets \
...@@ -124,16 +119,18 @@ EXPOSE 8083 ...@@ -124,16 +119,18 @@ EXPOSE 8083
USER root USER root
ENV COMPONENT=replicator
RUN echo "===> Installing ${COMPONENT}..." \ RUN echo "===> Installing ${COMPONENT}..." \
&& echo "===> Installing Schema Registry (for Avro jars) ..." \ && echo "===> Installing Schema Registry (for Avro jars) ..." \
&& dnf install --nogpgcheck -y /tmp/confluent-schema-registry-5.5.3-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-schema-registry-5.5.4-1.noarch.rpm \
&& echo "===> Installing Controlcenter for monitoring interceptors ..."\ && echo "===> Installing Controlcenter for monitoring interceptors ..."\
&& dnf install --nogpgcheck -y /tmp/confluent-control-center-fe-5.5.3-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-control-center-fe-5.5.4-1.noarch.rpm \
&& dnf install --nogpgcheck -y /tmp/confluent-control-center-5.5.3-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-control-center-5.5.4-1.noarch.rpm \
&& echo "===> Installing Confluent security plugins ..." \ && echo "===> Installing Confluent security plugins ..." \
&& dnf install --nogpgcheck -y /tmp/confluent-security-5.5.3-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-security-5.5.4-1.noarch.rpm \
&& echo "===> Installing Confluent Hub client ..." \ && echo "===> Installing Confluent Hub client ..." \
&& dnf install --nogpgcheck -y /tmp/confluent-hub-client-5.5.3-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-hub-client-5.5.4-1.noarch.rpm \
&& echo "===> Setting up ${COMPONENT} dirs ..." \ && echo "===> Setting up ${COMPONENT} dirs ..." \
&& mkdir -p /etc/${COMPONENT} /etc/${COMPONENT}/secrets /etc/${COMPONENT}/jars /usr/logs \ && mkdir -p /etc/${COMPONENT} /etc/${COMPONENT}/secrets /etc/${COMPONENT}/jars /usr/logs \
&& chown appuser:appuser -R /etc/${COMPONENT} /usr/logs \ && chown appuser:appuser -R /etc/${COMPONENT} /usr/logs \
...@@ -152,13 +149,11 @@ COPY --chown=appuser:appuser scripts/etc/confluent/docker /etc/confluent/docker ...@@ -152,13 +149,11 @@ COPY --chown=appuser:appuser scripts/etc/confluent/docker /etc/confluent/docker
## confluentinc/kafka-replicator-images/replicator ## confluentinc/kafka-replicator-images/replicator
RUN echo "===> Installing Replicator ..." \ RUN echo "===> Installing Replicator ..." \
&& yum -q -y update \ && yum -q -y update \
&& dnf install --nogpgcheck -y /tmp/confluent-kafka-connect-replicator-5.5.3-1.noarch.rpm && dnf install --nogpgcheck -y /tmp/confluent-kafka-connect-replicator-5.5.4-1.noarch.rpm
######################################## ########################################
## confluentinc/kafka-replicator-images/replicator-executable ## confluentinc/kafka-replicator-images/replicator-executable
ENV COMPONENT=replicator
USER root USER root
RUN echo "===> clean up ..." \ RUN echo "===> clean up ..." \
......
hardening_manifest.yaml
View file @ 127f13ac
This diff is collapsed.
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

UNCLASSIFIED