Flink 1.4 release. (#49)

d2iq-archive · Dec 13, 2017 · 9ee7c74 · 9ee7c74
1 parent 351f300
commit 9ee7c74
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 29 deletions.
diff --git a/container/appmaster/Dockerfile b/container/appmaster/Dockerfile
@@ -44,12 +44,12 @@ RUN chmod -R ugo+rw /var/log/
 WORKDIR /
 
 # Copy custom build to image.
-COPY flink/flink-dist/target/flink-1.3.1-bin/ .
+COPY flink/flink-dist/target/flink-1.4.0-bin/ .
 
 # Copy base Flink configuration to image.
-COPY conf/ flink-1.3.1/conf/
+COPY conf/ flink-1.4.0/conf/
 
-WORKDIR flink-1.3.1
+WORKDIR flink-1.4.0
 
-ENV FLINK_HOME /flink-1.3.1
-ENV FLINK_CONF_DIR /flink-1.3.1/conf
+ENV FLINK_HOME /flink-1.4.0
+ENV FLINK_CONF_DIR /flink-1.4.0/conf
diff --git a/container/appmaster/Makefile b/container/appmaster/Makefile
@@ -1,20 +1,12 @@
-IMAGENAME = dcos-flink:1.3.1-1.1
-IMAGENAME_2_11 = dcos-flink-2-11:1.3.1-1.1
+IMAGENAME = dcos-flink:1.4.0-1.0
 
-build: build-flink build-container build-flink-2-11 build-container-2-11
+build: build-flink build-container
 
 build-container:
 	docker build -t $(IMAGENAME) .
 
-build-container-2-11:
-	docker build -t $(IMAGENAME_2_11) .
-
-build-flink-2-11:
-	cd flink; ./tools/change-scala-version.sh 2.11; mvn clean package -DskipTests
-
 build-flink:
-	cd flink; ./tools/change-scala-version.sh 2.10; mvn clean package -DskipTests
+	cd flink;  mvn clean package -DskipTests
 
 push: build
 	docker push $(IMAGENAME)
-	docker push $(IMAGENAME_2_11)
diff --git a/container/appmaster/flink b/container/appmaster/flink
diff --git a/service/config.json b/service/config.json
@@ -56,11 +56,6 @@
            "description":"Use -D<KEY>=<VALUE> format to provide any additional Flink configuration options.",
            "type":"string",
            "default":""
-        },
-        "scala-2-11": {
-          "description":"Use flink compiled for scala-2.11 rather than the default scala-2.10",
-          "type":"boolean",
-          "default":true
         }
       }
     },

diff --git a/service/marathon.json.mustache b/service/marathon.json.mustache
@@ -54,12 +54,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-{{#service.scala-2-11}}
-      "image": "{{resource.assets.container.docker.flink-2-11}}",
-{{/service.scala-2-11}}
-{{^service.scala-2-11}}
       "image": "{{resource.assets.container.docker.flink}}",
-{{/service.scala-2-11}}
       "network": "HOST",
 {{#service.user}}
       "parameters": [

diff --git a/service/resource.json b/service/resource.json
@@ -2,14 +2,39 @@
   "assets": {
     "container": {
       "docker": {
-        "flink": "mesosphere/dcos-flink:1.2.0-1.4",
-        "flink-2-11": "mesosphere/dcos-flink-2-11:1.2.0-1.4"
+        "flink": "mesosphere/dcos-flink:1.4.0-1.0",
+        "internal": "openjdk:8-jre"
       }
     }
   },
   "images": {
     "icon-small": "https://s3.amazonaws.com/downloads.mesosphere.io/universe/assets/icon-service-flink-small.png",
     "icon-medium": "https://s3.amazonaws.com/downloads.mesosphere.io/universe/assets/icon-service-flink-medium.png",
     "icon-large": "https://s3.amazonaws.com/downloads.mesosphere.io/universe/assets/icon-service-flink-large.png"
+  },
+    "cli":{
+    "binaries":{
+      "darwin":{
+        "x86-64":{
+          "contentHash":[ { "algo":"sha256", "value":"a429b01603aca08ce3048d8a89b35338143f0f3457f5408b06014f03604187fd" } ],
+          "kind":"executable",
+          "url":"https://github.com/mesosphere/dcos-flink-service/raw/1.2/cli/dcos-flink/artifacts/dcos-flink-service-darwin"
+        }
+      },
+      "linux":{
+        "x86-64":{
+          "contentHash":[ { "algo":"sha256", "value":"5bf75fa2495a6774041a896ce72ab50b4ea532f76ad1cf71b2d92767a2f643b3" } ],
+          "kind":"executable",
+          "url":"https://github.com/mesosphere/dcos-flink-service/raw/master/cli/dcos-flink/artifacts/dcos-flink-service-linux"
+        }
+      },
+      "windows":{
+        "x86-64":{
+          "contentHash":[ { "algo":"sha256", "value":"019f8869fb6e177b6e3a763711dc8443af1d975688078d71b865860409e3a5b0" } ],
+          "kind":"executable",
+          "url":"https://github.com/mesosphere/dcos-flink-service/raw/1.2/cli/dcos-flink/artifacts/dcos-flink-service.exe"
+        }
+      }
+    }
   }
 }