diff --git a/cli/dcos-flink/tools/build_cli.sh b/cli/dcos-flink/tools/build_cli.sh index 52506fa..8e97e80 100755 --- 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 index 5fdafb4..3521627 100644 --- 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 index c724c5a..6dd9e70 100644 --- 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 index 3a9d9f2..04e4c85 160000 --- a/container/appmaster/flink +++ b/container/appmaster/flink @@ -1 +1 @@ -Subproject commit 3a9d9f24429fb70305f0a95e364bf48245e6d1a4 +Subproject commit 04e4c8522eb28573f54a9cec7b1559e9c3d0f7aa diff --git a/service/package.json b/service/package.json index 960ec19..077a777 100644 --- 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 index 795ca9b..bfcecc3 100644 --- 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" } }