Attach shaded jar

2011aad · Jan 14, 2021 · 0f8a69e · 0f8a69e
1 parent 634bce9
commit 0f8a69e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -38,16 +38,16 @@ RUN apt-get update \
 		apt-transport-https curl htop iftop iptraf iputils-ping jq lsof net-tools tzdata wget \
 	&& apt-get clean \
 	&& wget -q -P $JDBC_BRIDGE_HOME $JDBC_BRIDGE_REL_URL/LICENSE $JDBC_BRIDGE_REL_URL/NOTICE \
-		$JDBC_BRIDGE_REL_URL/clickhouse-jdbc-bridge-${revision}.jar \
+		$JDBC_BRIDGE_REL_URL/clickhouse-jdbc-bridge-${revision}-shaded.jar \
 	&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 COPY --chown=root:root docker/ $JDBC_BRIDGE_HOME
 
 RUN chmod +x $JDBC_BRIDGE_HOME/*.sh \
 	&& mkdir -p $JDBC_BRIDGE_HOME/logs /usr/local/lib/java \
 	&& ln -s $JDBC_BRIDGE_HOME/logs /var/log/clickhouse-jdbc-bridge \
-	&& ln -s $JDBC_BRIDGE_HOME/clickhouse-jdbc-bridge-$JDBC_BRIDGE_VERSION.jar \
-		/usr/local/lib/java/clickhouse-jdbc-bridge.jar \
+	&& ln -s $JDBC_BRIDGE_HOME/clickhouse-jdbc-bridge-${revision}-shaded.jar \
+		/usr/local/lib/java/clickhouse-jdbc-bridge-shaded.jar \
 	&& ln -s $JDBC_BRIDGE_HOME /etc/clickhouse-jdbc-bridge
 
 WORKDIR $JDBC_BRIDGE_HOME

diff --git a/all-in-one.Dockerfile b/all-in-one.Dockerfile
@@ -69,7 +69,7 @@ RUN apt-get update \
 		https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21.jar \
 	&& wget -q -P /etc/clickhouse-jdbc-bridge/drivers/postgres \
 		https://repo1.maven.org/maven2/org/postgresql/postgresql/42.2.18/postgresql-42.2.18.jar \
-	&& sed -i -e 's|\(^[[:space:]]*\)\(exec.*clickhouse-server.*$\)|\1exec clickhouse-jdbc-bridge\&\n\1\2|' /entrypoint.sh \
+	&& sed -i -e 's|\(^[[:space:]]*\)\(exec.*clickhouse-server.*$\)|\1exec -c clickhouse-jdbc-bridge >/dev/null \&\n\1\2|' /entrypoint.sh \
 	&& echo '{\n\
   "$schema": "../datasource-schema.json",\n\
   "self": {\n\

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
@@ -21,7 +21,7 @@ start_server() {
 	fi
 
 	if [ "$(echo ${CUSTOM_DRIVER_LOADER:="true"} | tr '[:upper:]' '[:lower:]')" != "true" ]; then
-		local classpath="./clickhouse-jdbc-bridge-$JDBC_BRIDGE_VERSION.jar:$(echo $(ls ${DRIVER_DIR:="drivers"}/*.jar) | tr ' ' ':'):."
+		local classpath="./clickhouse-jdbc-bridge-$JDBC_BRIDGE_VERSION-shaded.jar:$(echo $(ls ${DRIVER_DIR:="drivers"}/*.jar) | tr ' ' ':'):."
 		java -XX:+UseContainerSupport -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle \
 			-Xdump:none -Xdump:tool:events=systhrow+throw,filter=*OutOfMemoryError,exec="kill -9 %pid" \
 			-Dlog4j.configuration=file:///$JDBC_BRIDGE_HOME/log4j.properties -Dnashorn.args=--language=es6 \
@@ -30,7 +30,7 @@ start_server() {
 		java -XX:+UseContainerSupport -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle \
 			-Xdump:none -Xdump:tool:events=systhrow+throw,filter=*OutOfMemoryError,exec="kill -9 %pid" \
 			-Dlog4j.configuration=file:///$JDBC_BRIDGE_HOME/log4j.properties -Dnashorn.args=--language=es6 \
-			${JDBC_BRIDGE_JVM_OPTS:=""} -jar clickhouse-jdbc-bridge-$JDBC_BRIDGE_VERSION.jar
+			${JDBC_BRIDGE_JVM_OPTS:=""} -jar clickhouse-jdbc-bridge-$JDBC_BRIDGE_VERSION-shaded.jar
 	fi
 }
 

diff --git a/pom.xml b/pom.xml
@@ -240,7 +240,7 @@
                             <packageDescription>JDBC bridge for ClickHouse. It acts as a stateless proxy passing queries from ClickHouse to external datasources.</packageDescription>
                             <createSymLinks>true</createSymLinks>
                             <createIncludeFiles>false</createIncludeFiles>
-                            <excludeAllArtifacts>false</excludeAllArtifacts>
+                            <excludeAllArtifacts>true</excludeAllArtifacts>
                             <excludeAllDependencies>true</excludeAllDependencies>
                             <libDirectory>/usr/local/lib/java</libDirectory>
                             <useDefaultCopyResources>false</useDefaultCopyResources>
@@ -327,11 +327,11 @@
                                     <groupname>root</groupname>
                                     <sources>
                                         <source>
-                                            <location>target/clickhouse-jdbc-bridge-${project.version}.jar</location>
+                                            <location>target/clickhouse-jdbc-bridge-${project.version}-shaded.jar</location>
                                         </source>
                                         <softlinkSource>
-                                            <location>/usr/local/lib/java/clickhouse-jdbc-bridge-${project.version}.jar</location>
-                                            <destination>clickhouse-jdbc-bridge.jar</destination>
+                                            <location>/usr/local/lib/java/clickhouse-jdbc-bridge-${project.version}-shaded.jar</location>
+                                            <destination>clickhouse-jdbc-bridge-shaded.jar</destination>
                                         </softlinkSource>
                                     </sources>
                                 </mapping>
@@ -513,7 +513,7 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>${shade-plugin.version}</version>
                 <configuration>
-                    <shadedArtifactAttached>false</shadedArtifactAttached>
+                    <shadedArtifactAttached>true</shadedArtifactAttached>
                     <createDependencyReducedPom>true</createDependencyReducedPom>
                     <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                     <shadedClassifierName>shaded</shadedClassifierName>

diff --git a/src/main/bin/clickhouse-jdbc-bridge b/src/main/bin/clickhouse-jdbc-bridge
@@ -43,7 +43,7 @@ init_env() {
 
 start_server() {
     # override below environment variables as needed in $INIT_SCRIPT
-    : ${APP_PACKAGE:="/usr/local/lib/java/clickhouse-jdbc-bridge.jar"}
+    : ${APP_PACKAGE:="/usr/local/lib/java/clickhouse-jdbc-bridge-shaded.jar"}
     : ${JVM_ARGS:="-Xmx512m"}
     : ${WORK_DIRECTORY:=$(dirname "$INIT_SCRIPT")}
 
@@ -61,7 +61,7 @@ start_server() {
     fi
 
     echo "Work directory is set to [$WORK_DIRECTORY]"
-
+    cd "$WORK_DIRECTORY"
     java $JVM_ARGS -Dlog4j.configuration=file:///$WORK_DIRECTORY/log4j.properties \
         -Duser.dir="$WORK_DIRECTORY" -jar "$APP_PACKAGE"
 }