UNCLASSIFIED

Skip to content

GitLab

Commit be39fe87 authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'development' into 'master' 

Development

See merge request !9
parents 8ac5b960 b91201e0
Pipeline #467287 failed with stages
in 42 minutes and 53 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 59 deletions
Dockerfile
View file @ be39fe87
...@@ -68,17 +68,17 @@ ENV CUB_CLASSPATH='"/usr/share/java/cp-base-new/*"' ...@@ -68,17 +68,17 @@ ENV CUB_CLASSPATH='"/usr/share/java/cp-base-new/*"'
############ vvvvv This Container Below vvvvv ############ ############ vvvvv This Container Below vvvvv ############
# Copy required RPMs # Copy required RPMs
COPY confluent-common-5.5.4-1.noarch.rpm /tmp/ COPY confluent-common-5.5.5-1.noarch.rpm /tmp/
COPY confluent-control-center-5.5.4-1.noarch.rpm /tmp/ COPY confluent-control-center-5.5.5-1.noarch.rpm /tmp/
COPY confluent-control-center-fe-5.5.4-1.noarch.rpm /tmp/ COPY confluent-control-center-fe-5.5.5-1.noarch.rpm /tmp/
COPY confluent-hub-client-5.5.4-1.noarch.rpm /tmp/ COPY confluent-hub-client-5.5.5-1.noarch.rpm /tmp/
COPY confluent-kafka-connect-replicator-5.5.4-1.noarch.rpm /tmp/ COPY confluent-kafka-connect-replicator-5.5.5-1.noarch.rpm /tmp/
COPY confluent-metadata-service-5.5.4-1.noarch.rpm /tmp/ COPY confluent-metadata-service-5.5.5-1.noarch.rpm /tmp/
COPY confluent-rebalancer-5.5.4-1.noarch.rpm /tmp/ COPY confluent-rebalancer-5.5.5-1.noarch.rpm /tmp/
COPY confluent-rest-utils-5.5.4-1.noarch.rpm /tmp/ COPY confluent-rest-utils-5.5.5-1.noarch.rpm /tmp/
COPY confluent-schema-registry-5.5.4-1.noarch.rpm /tmp/ COPY confluent-schema-registry-5.5.5-1.noarch.rpm /tmp/
COPY confluent-security-5.5.4-1.noarch.rpm /tmp/ COPY confluent-security-5.5.5-1.noarch.rpm /tmp/
COPY confluent-server-5.5.4-1.noarch.rpm /tmp/ COPY confluent-server-5.5.5-1.noarch.rpm /tmp/
######################################## ########################################
# confluentinc/kafka-images/server # confluentinc/kafka-images/server
...@@ -95,14 +95,14 @@ EXPOSE 9092 ...@@ -95,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.4-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-common-5.5.5-1.noarch.rpm \
&& dnf install --nogpgcheck -y /tmp/confluent-rest-utils-5.5.4-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-rest-utils-5.5.5-1.noarch.rpm \
&& dnf install --nogpgcheck -y /tmp/confluent-metadata-service-5.5.4-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-metadata-service-5.5.5-1.noarch.rpm \
&& dnf install --nogpgcheck -y /tmp/confluent-server-5.5.4-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-server-5.5.5-1.noarch.rpm \
&& echo "===> installing confluent-rebalancer ..." \ && echo "===> installing confluent-rebalancer ..." \
&& dnf install --nogpgcheck -y /tmp/confluent-rebalancer-5.5.4-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-rebalancer-5.5.5-1.noarch.rpm \
&& echo "===> installing confluent-security ..." \ && echo "===> installing confluent-security ..." \
&& dnf install --nogpgcheck -y /tmp/confluent-security-5.5.4-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-security-5.5.5-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 \
...@@ -123,14 +123,14 @@ ENV COMPONENT=replicator ...@@ -123,14 +123,14 @@ 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.4-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-schema-registry-5.5.5-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.4-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-control-center-fe-5.5.5-1.noarch.rpm \
&& dnf install --nogpgcheck -y /tmp/confluent-control-center-5.5.4-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-control-center-5.5.5-1.noarch.rpm \
&& echo "===> Installing Confluent security plugins ..." \ && echo "===> Installing Confluent security plugins ..." \
&& dnf install --nogpgcheck -y /tmp/confluent-security-5.5.4-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-security-5.5.5-1.noarch.rpm \
&& echo "===> Installing Confluent Hub client ..." \ && echo "===> Installing Confluent Hub client ..." \
&& dnf install --nogpgcheck -y /tmp/confluent-hub-client-5.5.4-1.noarch.rpm \ && dnf install --nogpgcheck -y /tmp/confluent-hub-client-5.5.5-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 \
...@@ -149,7 +149,7 @@ COPY --chown=appuser:appuser scripts/etc/confluent/docker /etc/confluent/docker ...@@ -149,7 +149,7 @@ 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.4-1.noarch.rpm && dnf install --nogpgcheck -y /tmp/confluent-kafka-connect-replicator-5.5.5-1.noarch.rpm
######################################## ########################################
## confluentinc/kafka-replicator-images/replicator-executable ## confluentinc/kafka-replicator-images/replicator-executable
......
hardening_manifest.yaml
View file @ be39fe87
...@@ -9,6 +9,7 @@ name: "confluent/replicator/cp-enterprise-replicator-5.5.x" ...@@ -9,6 +9,7 @@ name: "confluent/replicator/cp-enterprise-replicator-5.5.x"
# on ironbank.dsop.io # on ironbank.dsop.io
tags: tags:
- "5.5.4" - "5.5.4"
- "5.5.5"
- "5.5.x" - "5.5.x"
- "5.5" - "5.5"
...@@ -97,11 +98,11 @@ resources: ...@@ -97,11 +98,11 @@ resources:
validation: validation:
type: sha256 type: sha256
value: 75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a value: 75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a
- filename: urllib3-1.26.4-py2.py3-none-any.whl - filename: urllib3-1.26.5-py2.py3-none-any.whl
url: https://files.pythonhosted.org/packages/09/c6/d3e3abe5b4f4f16cf0dfc9240ab7ce10c2baa0e268989a4e3ec19e90c84e/urllib3-1.26.4-py2.py3-none-any.whl url: https://files.pythonhosted.org/packages/0c/cd/1e2ec680ec7b09846dc6e605f5a7709dfb9d7128e51a026e7154e18a234e/urllib3-1.26.5-py2.py3-none-any.whl
validation: validation:
type: sha256 type: sha256
value: 2f4da4594db7e1e110a944bb1b551fdf4e6c136ad42e4234131391e21eb5b0df value: 753a0374df26658f99d826cfe40394a686d05985786d946fbe4165b5148f5a7c
- filename: cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl - filename: cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl
url: https://files.pythonhosted.org/packages/5c/0f/e07df370fac0e99e938edc62c8a15e54b9d75605e11838fa0ef300118e1d/cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl url: https://files.pythonhosted.org/packages/5c/0f/e07df370fac0e99e938edc62c8a15e54b9d75605e11838fa0ef300118e1d/cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl
validation: validation:
...@@ -222,61 +223,61 @@ resources: ...@@ -222,61 +223,61 @@ resources:
validation: validation:
type: sha256 type: sha256
value: 7e2622a934f04a2e5b23a355f920473ccf0144e946b433bc619a9802c1e3785c value: 7e2622a934f04a2e5b23a355f920473ccf0144e946b433bc619a9802c1e3785c
- filename: confluent-common-5.5.4-1.noarch.rpm - filename: confluent-common-5.5.5-1.noarch.rpm
url: https://packages.confluent.io/rpm/5.5/confluent-common-5.5.4-1.noarch.rpm url: https://packages.confluent.io/rpm/5.5/confluent-common-5.5.5-1.noarch.rpm
validation: validation:
type: sha256 type: sha256
value: e93d108159b622e0aea91692021ca26ca8521d16d4d05ddf36b0dca607f27a85 value: 80fcd5c1f756889eebbbf6c7744b36a910056250d54a34ab0941ac358c6755d7
- filename: confluent-control-center-5.5.4-1.noarch.rpm - filename: confluent-control-center-5.5.5-1.noarch.rpm
url: https://packages.confluent.io/rpm/5.5/confluent-control-center-5.5.4-1.noarch.rpm url: https://packages.confluent.io/rpm/5.5/confluent-control-center-5.5.5-1.noarch.rpm
validation: validation:
type: sha256 type: sha256
value: 72798e1dfaa9d1b15dac2aa756353620d21549d6dd4fdb9320f1b413f502b44e value: 81557a1a1fd5ca0e75a37dbf564ee8c3941e3fa1a086306b04558a21f8c1a9a8
- filename: confluent-control-center-fe-5.5.4-1.noarch.rpm - filename: confluent-control-center-fe-5.5.5-1.noarch.rpm
url: https://packages.confluent.io/rpm/5.5/confluent-control-center-fe-5.5.4-1.noarch.rpm url: https://packages.confluent.io/rpm/5.5/confluent-control-center-fe-5.5.5-1.noarch.rpm
validation: validation:
type: sha256 type: sha256
value: d3997c3e8ce5cd9952712c66eca9e9768f79daa6688912d63a46a9092b4ba4c9 value: 9f40732b25da1cc5d7864dd6a1a02c94ce36836cb7f983335f559cffbad32a69
- filename: confluent-rebalancer-5.5.4-1.noarch.rpm - filename: confluent-rebalancer-5.5.5-1.noarch.rpm
url: https://packages.confluent.io/rpm/5.5/confluent-rebalancer-5.5.4-1.noarch.rpm url: https://packages.confluent.io/rpm/5.5/confluent-rebalancer-5.5.5-1.noarch.rpm
validation: validation:
type: sha256 type: sha256
value: f86f222733795f61cf0023adea4754cbdc405dbbb95682bc1c465ec64f0475af value: 957b6f4803013eed18079d1721952d93621349c7363464f4ecd67bb0a2fbe7f1
- filename: confluent-rest-utils-5.5.4-1.noarch.rpm - filename: confluent-rest-utils-5.5.5-1.noarch.rpm
url: https://packages.confluent.io/rpm/5.5/confluent-rest-utils-5.5.4-1.noarch.rpm url: https://packages.confluent.io/rpm/5.5/confluent-rest-utils-5.5.5-1.noarch.rpm
validation: validation:
type: sha256 type: sha256
value: acefcb0c494db95172190e9dcf4703d694b515ab33c8174372189e8a022aa01f value: 02b8bfe06a504380bed46cc0f6be751aae33f9df615d4443ebc883446e8f2aee
- filename: confluent-security-5.5.4-1.noarch.rpm - filename: confluent-security-5.5.5-1.noarch.rpm
url: https://packages.confluent.io/rpm/5.5/confluent-security-5.5.4-1.noarch.rpm url: https://packages.confluent.io/rpm/5.5/confluent-security-5.5.5-1.noarch.rpm
validation: validation:
type: sha256 type: sha256
value: 0286744a98e6dd9fd8812d66c11ff106632c2d5b71e3e3c8e99f6f0ce66f7b10 value: 5273b4bb9964dee14204c21be3f8ab57578c86b523214515e6cc1059ee263d89
- filename: confluent-schema-registry-5.5.4-1.noarch.rpm - filename: confluent-schema-registry-5.5.5-1.noarch.rpm
url: https://packages.confluent.io/rpm/5.5/confluent-schema-registry-5.5.4-1.noarch.rpm url: https://packages.confluent.io/rpm/5.5/confluent-schema-registry-5.5.5-1.noarch.rpm
validation: validation:
type: sha256 type: sha256
value: ad5a7def1f25373c3da899d11df04594be3dad80bd33860c3ad1613542e8a266 value: 42673ffb8ba4c8204987a78dae30d12e7e7f9245d235b681590c79bc50f05278
- filename: confluent-hub-client-5.5.4-1.noarch.rpm - filename: confluent-hub-client-5.5.5-1.noarch.rpm
url: https://packages.confluent.io/rpm/5.5/confluent-hub-client-5.5.4-1.noarch.rpm url: https://packages.confluent.io/rpm/5.5/confluent-hub-client-5.5.5-1.noarch.rpm
validation: validation:
type: sha256 type: sha256
value: 4236376486acfeba6bd48cc3c727edaeb586e39f1545af70500e27fcf63b3d0a value: 5acd64249ba884c6448626b9cdf314c26a3c5f52166b220b04031527541e20f7
- filename: confluent-metadata-service-5.5.4-1.noarch.rpm - filename: confluent-metadata-service-5.5.5-1.noarch.rpm
url: https://packages.confluent.io/rpm/5.5/confluent-metadata-service-5.5.4-1.noarch.rpm url: https://packages.confluent.io/rpm/5.5/confluent-metadata-service-5.5.5-1.noarch.rpm
validation: validation:
type: sha256 type: sha256
value: 29a53786b529aa9ef27610b3f62603e807f2a844a6d1a6739f4ba151d790001b value: 2de4f5ae6058f8ddb49b4f9e69542e0c74f150b1ece50c844b8999ad2181aac7
- filename: confluent-server-5.5.4-1.noarch.rpm - filename: confluent-server-5.5.5-1.noarch.rpm
url: https://packages.confluent.io/rpm/5.5/confluent-server-5.5.4-1.noarch.rpm url: https://packages.confluent.io/rpm/5.5/confluent-server-5.5.5-1.noarch.rpm
validation: validation:
type: sha256 type: sha256
value: aabd3bfd3a5e70b69f27e5fdf8fb80fc2e2601d9559400811029320a760e9290 value: ff66c9bf315b22aabf430e8f2dbedc7d9c71bee569227e7cd8c5f759c232d178
- filename: confluent-kafka-connect-replicator-5.5.4-1.noarch.rpm - filename: confluent-kafka-connect-replicator-5.5.5-1.noarch.rpm
url: https://packages.confluent.io/rpm/5.5/confluent-kafka-connect-replicator-5.5.4-1.noarch.rpm url: https://packages.confluent.io/rpm/5.5/confluent-kafka-connect-replicator-5.5.5-1.noarch.rpm
validation: validation:
type: sha256 type: sha256
value: 4bd27c80186166373e44502336886434ef1380f0218415f7ba99bee0d52f26f0 value: 89f32b7c5df5ebfc4e7ed7b8e876d4437d62fe4c029d8e9530dd9454b99f99da
- filename: cp-base-new-5.5.4_doc.tar.gz - filename: cp-base-new-5.5.4_doc.tar.gz
url: https://ironbank-files.s3.amazonaws.com/cp-base-new-5.5.4_doc.tar.gz url: https://ironbank-files.s3.amazonaws.com/cp-base-new-5.5.4_doc.tar.gz
validation: validation:
......
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