Skip to content

Commit f91c6fd

Browse files
committed
chore: Ship runner uber JAR in Flink lib/
1 parent a42454c commit f91c6fd

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

flink-sql-runner/src/main/docker/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
FROM apache/flink:${flink-base-image}
1818

19-
RUN mkdir -p /opt/flink/plugins/flink-sql-runner
20-
2119
COPY flink-table-planner_2.12-*.jar /opt/flink/lib
2220
COPY flink-s3-fs-hadoop-*.jar /opt/flink/lib
2321
COPY hadoop-common-*.jar /opt/flink/lib
@@ -26,11 +24,11 @@ COPY hadoop-mapreduce-client-core-*.jar /opt/flink/lib
2624
COPY iceberg-flink-runtime-*.jar /opt/flink/lib
2725
COPY iceberg-aws-bundle-*.jar /opt/flink/lib
2826
COPY stdlib-utils-*.jar /opt/flink/lib
29-
COPY flink-sql-runner.uber.jar /opt/flink/plugins/flink-sql-runner
27+
COPY flink-sql-runner.uber.jar /opt/flink/lib/sql-runner.uber.jar
3028
COPY --chmod=755 entrypoint.sh /entrypoint.sh
3129

3230
RUN rm -rf /opt/flink/lib/flink-table-planner-loader-*.jar \
33-
&& ln -s /opt/flink/plugins/flink-sql-runner/flink-sql-runner.uber.jar /opt/flink/flink-sql-runner.jar \
31+
&& echo 'UEsDBBQACAgIAG2UllwAAAAAAAAAAAAAAAAUAAQATUVUQS1JTkYvTUFOSUZFU1QuTUb+ygAA803My0xLLS7RDUstKs7Mz7NSMNQz4HIuSk0sSU3Rdaq0UkjLyczL1i0uzNEtKs3LSy3i4gIAUEsHCL/cUjU2AAAANAAAAFBLAQIUABQACAgIAG2Ully/3FI1NgAAADQAAAAUAAQAAAAAAAAAAAAAAAAAAABNRVRBLUlORi9NQU5JRkVTVC5NRv7KAABQSwUGAAAAAAEAAQBGAAAAfAAAAAAA' | base64 -d > /opt/flink/noop.jar \
3432
&& mkdir -p /opt/flink/hadoop-conf \
3533
&& echo '<configuration><property><name>fs.s3a.aws.credentials.provider</name><value>com.amazonaws.auth.DefaultAWSCredentialsProviderChain</value></property></configuration>' > /opt/flink/hadoop-conf/core-site.xml
3634

flink-sql-runner/src/test/java/com/datasqrl/flinkrunner/AbstractITSupport.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,9 @@ protected String flinkRun(List<String> sqlRunnerArgs, @Nullable String savepoint
165165
execCmd.add(savepointPath);
166166
}
167167

168-
execCmd.add("./plugins/flink-sql-runner/flink-sql-runner.uber.jar");
168+
execCmd.add("-c");
169+
execCmd.add("com.datasqrl.flinkrunner.CliRunner");
170+
execCmd.add("noop.jar");
169171
execCmd.addAll(sqlRunnerArgs);
170172

171173
var execRes = flinkContainer.execInContainer(execCmd.toArray(new String[0]));

0 commit comments

Comments
 (0)