Update base Docker image for building Feast Serving image (#535)

davidheryanto · web-flow · commit fb893ded90cd · 2020-03-16T09:45:39.000+08:00
* Update base Docker image for building Feast Serving image
- Add clean phase before packaging for more deterministic build (in case host directory is dirty)
- Move the downloading of grpc-health-probe in Feast Serving to build stage so the production stage does not need extra tools like wget, for slimmer production image.

* Update base Docker image for Feast Serving in Dockerfile.dev
diff --git a/infra/docker/core/Dockerfile b/infra/docker/core/Dockerfile
@@ -13,7 +13,7 @@ WORKDIR /build
 #
 ENV MAVEN_OPTS="-Dmaven.repo.local=/build/.m2/repository -DdependencyLocationsEnabled=false"
 RUN mvn --also-make --projects core,ingestion -Drevision=$REVISION \
-  -DskipTests=true --batch-mode package
+  -DskipTests=true --batch-mode clean package
 #
 # Unpack the jar and copy the files into production Docker image
 # for faster startup time when starting Dataflow jobs from Feast Core.
@@ -32,6 +32,7 @@ RUN apt-get -qq update && apt-get -y install unar && \
 FROM openjdk:11-jre as production
 ARG REVISION=dev
 COPY --from=builder /build/core/target/feast-core-$REVISION.jar /opt/feast/feast-core.jar
+# Required for staging jar dependencies when submitting Dataflow jobs.
 COPY --from=builder /build/core/target/feast-core-$REVISION /opt/feast/feast-core
 CMD ["java",\
      "-Xms2048m",\
diff --git a/infra/docker/serving/Dockerfile b/infra/docker/serving/Dockerfile
@@ -2,7 +2,7 @@
 # Build stage 1: Builder
 # ============================================================
 
-FROM maven:3.6-jdk-11-slim as builder
+FROM maven:3.6-jdk-11 as builder
 ARG REVISION=dev
 COPY  . /build
 WORKDIR /build
@@ -13,22 +13,23 @@ WORKDIR /build
 #
 ENV MAVEN_OPTS="-Dmaven.repo.local=/build/.m2/repository -DdependencyLocationsEnabled=false"
 RUN mvn --also-make --projects serving -Drevision=$REVISION \
-  -DskipTests=true --batch-mode package
-
-# ============================================================
-# Build stage 2: Production
-# ============================================================
-
-FROM openjdk:11-jre-alpine as production
-ARG REVISION=dev
+  -DskipTests=true --batch-mode clean package
 #
 # Download grpc_health_probe to run health check for Feast Serving
 # https://kubernetes.io/blog/2018/10/01/health-checking-grpc-servers-on-kubernetes/
 #
 RUN wget -q https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.3.1/grpc_health_probe-linux-amd64 \
          -O /usr/bin/grpc-health-probe && \
     chmod +x /usr/bin/grpc-health-probe
+
+# ============================================================
+# Build stage 2: Production
+# ============================================================
+
+FROM openjdk:11-jre-slim as production
+ARG REVISION=dev
 COPY --from=builder /build/serving/target/feast-serving-$REVISION.jar /opt/feast/feast-serving.jar
+COPY --from=builder /usr/bin/grpc-health-probe /usr/bin/grpc-health-probe
 CMD ["java",\
      "-Xms1024m",\
      "-Xmx1024m",\
diff --git a/infra/docker/serving/Dockerfile.dev b/infra/docker/serving/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM openjdk:11-jre-alpine as production
+FROM openjdk:11-jre as production
 ARG REVISION=dev
 #
 # Download grpc_health_probe to run health check for Feast Serving

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM openjdk:11-jre-alpine as production`
	`1`	`+FROM openjdk:11-jre as production`
`2`	`2`	`ARG REVISION=dev`
`3`	`3`	`#`
`4`	`4`	`# Download grpc_health_probe to run health check for Feast Serving`