Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/op 3604 #8

Merged
merged 5 commits into from
Jun 24, 2021
Merged

Feat/op 3604 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fcec48e
OP-3346: update Jenkinsfile to push docker for release branch
jainshashank24 Jun 22, 2021
990873b
fixed the other critical vulnerability
jainshashank24 Jun 23, 2021
0f11f41
fixed the other critical vulnerability
jainshashank24 Jun 23, 2021
3c1ebe8
fixed the other critical vulnerability
jainshashank24 Jun 24, 2021
5d4ee66
fixed the other critical vulnerability
jainshashank24 Jun 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.0-4,1.2
3.0.0-4,1.3
14 changes: 12 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG spark_image_tag=3.0.0-4-hadoop3.2-1.2
ARG spark_image_tag=3.0.0-4-hadoop3.2-1.3

FROM artifacts.ggn.in.guavus.com:4244/spark:${spark_image_tag}

Expand Down Expand Up @@ -39,7 +39,17 @@ RUN apt-get update -y && \
mv spark-sql-kafka-0-10_2.12-3.0.0.jar /opt/spark/jars/ && \
mv kafka-clients-2.2.0.jar /opt/spark/jars/ && \
mv spark-streaming-kafka-0-10_2.12-3.0.0.jar /opt/spark/jars/ && \
mv jmx_prometheus_javaagent-0.13.0.jar /opt/spark/jars/
mv jmx_prometheus_javaagent-0.13.0.jar /opt/spark/jars/ && \
rm -rf /opt/spark/jars/htrace-core4-4.1.0-incubating.jar && \
rm -rf /opt/spark/jars/json-smart-2.3.jar && \
curl -fSL https://repo1.maven.org/maven2/net/minidev/json-smart/2.4.1/json-smart-2.4.1.jar -o json-smart-2.3.jar && \
mv json-smart-2.3.jar /opt/spark/jars/ && \
rm -rf /opt/spark/jars/log4j-1.2.17.jar && \
curl -fSL https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.8.2/log4j-core-2.8.2.jar -o log4j-core-2.8.2.jar && \
mv log4j-core-2.8.2.jar /opt/spark/jars/ && \
rm -rf /opt/spark/jars/nimbus-jose-jwt-4.41.1.jar && \
curl -fSL https://repo1.maven.org/maven2/com/nimbusds/nimbus-jose-jwt/7.9/nimbus-jose-jwt-7.9.jar -o nimbus-jose-jwt-7.9.jar && \
mv nimbus-jose-jwt-7.9.jar /opt/spark/jars/



Expand Down
3 changes: 2 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ pipeline
if( env.buildType in ['release'] )
{
PUSH_JAR = true;
PUSH_DOCKER = true;
}
else if ( env.buildType ==~ /PR-.*/ ) {
PUSH_DOCKER = true
PUSH_DOCKER = true;
}

}
Expand Down
14 changes: 12 additions & 2 deletions PysparkDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG spark_image_tag=3.0.0-4-hadoop3.2-1.2
ARG spark_image_tag=3.0.0-4-hadoop3.2-1.3

FROM artifacts.ggn.in.guavus.com:4244/spark-py:${spark_image_tag}

Expand Down Expand Up @@ -39,7 +39,17 @@ RUN apt-get update -y && \
mv spark-sql-kafka-0-10_2.12-3.0.0.jar /opt/spark/jars/ && \
mv kafka-clients-2.2.0.jar /opt/spark/jars/ && \
mv spark-streaming-kafka-0-10_2.12-3.0.0.jar /opt/spark/jars/ && \
mv jmx_prometheus_javaagent-0.13.0.jar /opt/spark/jars/
mv jmx_prometheus_javaagent-0.13.0.jar /opt/spark/jars/ && \
rm -rf /opt/spark/jars/htrace-core4-4.1.0-incubating.jar && \
rm -rf /opt/spark/jars/json-smart-2.3.jar && \
curl -fSL https://repo1.maven.org/maven2/net/minidev/json-smart/2.4.1/json-smart-2.4.1.jar -o json-smart-2.3.jar && \
mv json-smart-2.3.jar /opt/spark/jars/ && \
rm -rf /opt/spark/jars/log4j-1.2.17.jar && \
curl -fSL https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.8.2/log4j-core-2.8.2.jar -o log4j-core-2.8.2.jar && \
mv log4j-core-2.8.2.jar /opt/spark/jars/ && \
rm -rf /opt/spark/jars/nimbus-jose-jwt-4.41.1.jar && \
curl -fSL https://repo1.maven.org/maven2/com/nimbusds/nimbus-jose-jwt/7.9/nimbus-jose-jwt-7.9.jar -o nimbus-jose-jwt-7.9.jar && \
mv nimbus-jose-jwt-7.9.jar /opt/spark/jars/



Expand Down
8 changes: 4 additions & 4 deletions dev/deps/spark-deps-hadoop-3.2-hive-2.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ hive-vector-code-gen/2.3.7//hive-vector-code-gen-2.3.7.jar
hk2-api/2.6.1//hk2-api-2.6.1.jar
hk2-locator/2.6.1//hk2-locator-2.6.1.jar
hk2-utils/2.6.1//hk2-utils-2.6.1.jar
htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
htrace-core4/4.2.0-incubating//htrace-core4-4.2.0-incubating.jar
httpclient/4.5.6//httpclient-4.5.6.jar
httpcore/4.4.12//httpcore-4.4.12.jar
istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar
Expand Down Expand Up @@ -140,7 +140,7 @@ jline/2.14.6//jline-2.14.6.jar
joda-time/2.10.5//joda-time-2.10.5.jar
jodd-core/3.5.2//jodd-core-3.5.2.jar
jpam/1.1//jpam-1.1.jar
json-smart/2.3//json-smart-2.3.jar
json-smart/2.4.1//json-smart-2.4.1.jar
json/1.8//json-1.8.jar
json4s-ast_2.12/3.6.6//json4s-ast_2.12-3.6.6.jar
json4s-core_2.12/3.6.6//json4s-core_2.12-3.6.6.jar
Expand Down Expand Up @@ -171,7 +171,7 @@ kubernetes-model/4.9.2//kubernetes-model-4.9.2.jar
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
libfb303/0.9.3//libfb303-0.9.3.jar
libthrift/0.12.0//libthrift-0.12.0.jar
log4j/1.2.17//log4j-1.2.17.jar
log4j/2.8.2//log4j-2.8.2.jar
logging-interceptor/3.12.6//logging-interceptor-3.12.6.jar
lz4-java/1.7.1//lz4-java-1.7.1.jar
machinist_2.12/0.6.8//machinist_2.12-0.6.8.jar
Expand All @@ -184,7 +184,7 @@ metrics-json/4.1.1//metrics-json-4.1.1.jar
metrics-jvm/4.1.1//metrics-jvm-4.1.1.jar
minlog/1.3.0//minlog-1.3.0.jar
netty-all/4.1.47.Final//netty-all-4.1.47.Final.jar
nimbus-jose-jwt/4.41.1//nimbus-jose-jwt-4.41.1.jar
nimbus-jose-jwt/7.9//nimbus-jose-jwt-7.9.jar
objenesis/2.5.1//objenesis-2.5.1.jar
okhttp/2.7.5//okhttp-2.7.5.jar
okhttp/3.12.6//okhttp-3.12.6.jar
Expand Down