Fixup make distribution dockerfile copies (apache#302)

gatesn · Jan 25, 2018 · ab1b681 · ab1b681
1 parent 05bd224
commit ab1b681
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh
@@ -178,11 +178,6 @@ echo "Build flags: $@" >> "$DISTDIR/RELEASE"
 # Copy jars
 cp "$SPARK_HOME"/assembly/target/scala*/jars/* "$DISTDIR/jars/"
 
-# Copy docker files
-mkdir -p "$DISTDIR/dockerfiles"
-DOCKERFILES_SRC="$SPARK_HOME/resource-managers/kubernetes/docker-minimal-bundle/src/main/docker"
-cp -R "$DOCKERFILES_SRC/." "$DISTDIR/dockerfiles/."
-
 # Only create the yarn directory if the yarn artifacts were built.
 if [ -f "$SPARK_HOME"/common/network-yarn/target/scala*/spark-*-yarn-shuffle.jar ]; then
   mkdir "$DISTDIR/yarn"
@@ -192,7 +187,7 @@ fi
 # Only create and copy the dockerfiles directory if the kubernetes artifacts were built.
 if [ -d "$SPARK_HOME"/resource-managers/kubernetes/core/target/ ]; then
   mkdir -p "$DISTDIR/kubernetes/"
-  cp -a "$SPARK_HOME"/resource-managers/kubernetes/docker/src/main/dockerfiles "$DISTDIR/kubernetes/"
+  cp -a "$SPARK_HOME"/resource-managers/kubernetes/docker-minimal-bundle/src/main/docker/ "$DISTDIR/kubernetes"
 fi
 
 # Copy examples and dependencies