[
https://issues.apache.org/jira/browse/BEAM-5419?focusedWorklogId=176185&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-176185
]
ASF GitHub Bot logged work on BEAM-5419:
----------------------------------------
Author: ASF GitHub Bot
Created on: 17/Dec/18 18:43
Start Date: 17/Dec/18 18:43
Worklog Time Spent: 10m
Work Description: mxm closed pull request #7299: [BEAM-5419] Simplify
job-server-container targets
URL: https://github.com/apache/beam/pull/7299
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/runners/flink/1.6/job-server-container/build.gradle
b/runners/flink/1.6/job-server-container/build.gradle
index a1ae99a5d6eb..afdb68a0fc91 100644
--- a/runners/flink/1.6/job-server-container/build.gradle
+++ b/runners/flink/1.6/job-server-container/build.gradle
@@ -16,10 +16,11 @@
* limitations under the License.
*/
+def basePath = '../../job-server-container'
+
project.ext {
- docker_file = file('../../job-server-container/Dockerfile')
- startup_script = file('../../job-server-container/flink-job-server.sh')
+ resource_path = basePath
}
// Load the main build script which contains all build logic.
-apply from: '../../job-server-container/flink_job_server_container.gradle'
+apply from: "$basePath/flink_job_server_container.gradle"
diff --git a/runners/flink/job-server-container/Dockerfile
b/runners/flink/job-server-container/Dockerfile
index 51f0e0f74cae..0381131a9ca3 100644
--- a/runners/flink/job-server-container/Dockerfile
+++ b/runners/flink/job-server-container/Dockerfile
@@ -21,8 +21,8 @@ MAINTAINER "Apache Beam <[email protected]>"
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y
libltdl7
-ADD target/beam-runners-flink-job-server.jar /opt/apache/beam/jars/
-ADD target/flink-job-server.sh /opt/apache/beam/
+ADD beam-runners-flink-job-server.jar /opt/apache/beam/jars/
+ADD flink-job-server.sh /opt/apache/beam/
WORKDIR /opt/apache/beam
ENTRYPOINT ["./flink-job-server.sh"]
diff --git a/runners/flink/job-server-container/build.gradle
b/runners/flink/job-server-container/build.gradle
index 96d4e12117fe..eac001c04584 100644
--- a/runners/flink/job-server-container/build.gradle
+++ b/runners/flink/job-server-container/build.gradle
@@ -17,8 +17,7 @@
*/
project.ext {
- docker_file = file('Dockerfile')
- startup_script = file('flink-job-server.sh')
+ resource_path = '.'
}
// Load the main build script which contains all build logic.
diff --git
a/runners/flink/job-server-container/flink_job_server_container.gradle
b/runners/flink/job-server-container/flink_job_server_container.gradle
index 363a99c40021..1a31e1a81e0d 100644
--- a/runners/flink/job-server-container/flink_job_server_container.gradle
+++ b/runners/flink/job-server-container/flink_job_server_container.gradle
@@ -42,13 +42,13 @@ task copyDockerfileDependencies(type: Copy) {
// Required Jars
from configurations.dockerDependency
rename 'beam-runners-flink.*-job-server.*.jar',
'beam-runners-flink-job-server.jar'
- into "build/target"
+ into "build"
// Entry script
- from startup_script
- into "build/target"
+ from "$resource_path/flink-job-server.sh"
+ into "build"
// Dockerfile
- from docker_file
- into "build/target"
+ from "$resource_path/Dockerfile"
+ into "build"
}
docker {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 176185)
Time Spent: 4h (was: 3h 50m)
> Build multiple versions of the Flink Runner against different Flink versions
> ----------------------------------------------------------------------------
>
> Key: BEAM-5419
> URL: https://issues.apache.org/jira/browse/BEAM-5419
> Project: Beam
> Issue Type: New Feature
> Components: build-system, runner-flink
> Reporter: Maximilian Michels
> Assignee: Maximilian Michels
> Priority: Major
> Fix For: 2.10.0
>
> Time Spent: 4h
> Remaining Estimate: 0h
>
> Following up on a discussion on the mailing list.
> We want to keep the Flink version stable across different versions to avoid
> upgrade pain for long-term users. At the same time, there are users out there
> with newer Flink clusters and developers also want to utilize new Flink
> features.
> It would be great to build multiple versions of the Flink Runner against
> different Flink versions.
> When the upgrade is as simple as changing the version property in the build
> script, this should be pretty straight-forward. If not, having a "base
> version" and applying a patch during the build could be an option. We should
> avoid duplicating any Runner code.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
