UNCLASSIFIED

Commit 86966279 authored by alexander.klepal's avatar alexander.klepal
Browse files

Merge branch 'maven-update' into 'development'

Maven update

See merge request !18
parents cd084aa4 07a178f1
Pipeline #314604 passed with stages
in 34 minutes and 31 seconds
archive.key
*.whl
*.jar
*.tar.gz
*.rpm
jsonnet
\ No newline at end of file
*.rpm
\ No newline at end of file
......@@ -89,6 +89,7 @@ COPY cp-${COMPONENT}-operator-*_UsrBin.tar.gz /usr/bin/
## For auditing & debugging
COPY Dockerfile /etc/confluent/ironbank/
COPY hardening_manifest.yaml /etc/confluent/ironbank/
COPY maven-artifact-3.8.1.jar /tmp/
RUN echo "===> Installing operator stuff" \
&& cd /usr/share && tar -xvf *_UsrShareJava.tar.gz && rm *_UsrShareJava.tar.gz \
......@@ -97,6 +98,8 @@ RUN echo "===> Installing operator stuff" \
&& cd /etc && tar -xvf *_EtcKsqldb.tar.gz && rm *_EtcKsqldb.tar.gz \
&& cd /opt/confluent/ksql && tar -xvf *_OptConfluentKsqlLibs.tar.gz && rm *_OptConfluentKsqlLibs.tar.gz \
&& cd /usr/bin && tar -xvf *_UsrBin.tar.gz && rm *_UsrBin.tar.gz \
&& find /usr/share/java /opt/confluent/ksql -name "maven-artifact-3.6.3.jar" -execdir cp /tmp/maven-artifact-3.8.1.jar . \; -exec rm {} \; \
&& chown appuser:appuser /opt/confluent/ksql/libs/maven-artifact-3.8.1.jar && chmod 755 /opt/confluent/ksql/libs/maven-artifact-3.8.1.jar \
&& chown -R appuser:appuser /etc/confluent /etc/${COMPONENT} /usr/logs /usr/bin/ksql /usr/share/java \
&& mkdir -p "${KSQL_LOG4J_DIR}" "${KSQL_SECRETS_DIR}" "${KSQL_CONFIG_DIR}" "${KSQL_DATA_DIR}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}" \
&& chmod -R ag+w "${KSQL_LOG4J_DIR}" "${KSQL_SECRETS_DIR}" "${KSQL_CONFIG_DIR}" "${KSQL_DATA_DIR}" "/opt" \
......
......@@ -221,7 +221,7 @@ resources:
url: https://packages.confluent.io/rpm/6.1/archive.key
validation:
type: sha256
value: b569e9d80bc08b65d342491f8b94e47eb7032701ce17b091f212e1072672a4d5
value: b569e9d80bc08b65d342491f8b94e47eb7032701ce17b091f212e1072672a4d5
- filename: confluent-common-6.1.1-1.noarch.rpm
url: https://packages.confluent.io/rpm/6.1/confluent-common-6.1.1-1.noarch.rpm
validation:
......@@ -276,7 +276,12 @@ resources:
url: https://ironbank-files.s3.amazonaws.com/cp-ksqldb-server-operator-6.1.1.0_UsrBin.tar.gz
validation:
type: sha256
value: d76da0002ea5b36cf3ea788aaeacc55eafc5f8ab4e5807e9d6e3ecc4794066b4
value: d76da0002ea5b36cf3ea788aaeacc55eafc5f8ab4e5807e9d6e3ecc4794066b4
- filename: maven-artifact-3.8.1.jar
url: https://repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.1/maven-artifact-3.8.1.jar
validation:
type: sha256
value: 9dbd3db15ac4816471e72981cb06ef90f3ffa8be6628dddf7135f7bd69bee0c0
# List of project maintainers
maintainers:
......
......@@ -53,6 +53,7 @@ mani=$(realpath "../hardening_manifest.yaml")
importArtifacts $mani 'ironbank-files.s3.amazonaws.com' "$RESOURCE_HOME/ironbank-files"
importArtifacts $mani 'packages.confluent.io' "$RESOURCE_HOME/confluent"
importArtifacts $mani 'files.pythonhosted.org' "$RESOURCE_HOME/pythonhosted"
importArtifacts $mani 'repo1.maven.org' "$RESOURCE_HOME/maven"
echo "Generating hardening_manifest_template.yaml ..."
$SCRIPTS_HOME/genManifestTemplate.sh "$RESOURCE_HOME/ironbank-files"
......
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