1.4.2 (#55)

* Added go fmt to build_cli.sh. * Added Flink 1.4.2.
d2iq-archive · May 16, 2018 · 11e3788 · 11e3788
1 parent 94df04b
commit 11e3788
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/cli/dcos-flink/tools/build_cli.sh b/cli/dcos-flink/tools/build_cli.sh
@@ -13,6 +13,7 @@ CLI_EXE_NAME=dcos-flink-service
 # go
 cd ..
 
+go fmt
 go get
 
 CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -ldflags="-s -w" -o $CLI_EXE_NAME".exe"

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.4.1-bin/ .
+COPY flink/flink-dist/target/flink-1.4.2-bin/ .
 
 # Copy base Flink configuration to image.
-COPY conf/ flink-1.4.1/conf/
+COPY conf/ flink-1.4.2/conf/
 
-WORKDIR flink-1.4.1
+WORKDIR flink-1.4.2
 
-ENV FLINK_HOME /flink-1.4.1
-ENV FLINK_CONF_DIR /flink-1.4.1/conf
+ENV FLINK_HOME /flink-1.4.2
+ENV FLINK_CONF_DIR /flink-1.4.2/conf
diff --git a/container/appmaster/Makefile b/container/appmaster/Makefile
@@ -1,4 +1,4 @@
-IMAGENAME = dcos-flink:1.4.0-1.0
+IMAGENAME = dcos-flink:1.4.2-1.0
 
 build: build-flink build-container
 

diff --git a/container/appmaster/flink b/container/appmaster/flink
diff --git a/service/package.json b/service/package.json
@@ -2,7 +2,7 @@
     "packagingVersion": "3.0",
 
     "name": "flink",
-    "version": "1.2.dev@55d6061",
+    "version": "1.4.2-1.0",
     "description": "Apache Flink® is an open source platform for distributed stream and batch data processing.",
     "framework": true,
     "website": "http://flink.apache.org/",

diff --git a/service/resource.json b/service/resource.json
@@ -2,7 +2,7 @@
   "assets": {
     "container": {
       "docker": {
-        "flink": "mesosphere/dcos-flink:1.4.0-1.0",
+        "flink": "mesosphere/dcos-flink:1.4.2-1.0",
         "internal": "openjdk:8-jre"
       }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ CLI_EXE_NAME=dcos-flink-service @@
     # go
     cd ..
+    go fmt
     go get
     CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -ldflags="-s -w" -o $CLI_EXE_NAME".exe"
@@ Expand Down @@