Skip to content

Commit 2f8d0b9

Browse files
committed
[SPARK-22960][K8S] Revert use of ARG base_image in images
1 parent 930b90a commit 2f8d0b9

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

resource-managers/kubernetes/docker/src/main/dockerfiles/driver/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
# limitations under the License.
1616
#
1717

18-
ARG base_image
19-
FROM ${base_image}
18+
FROM spark-base
2019

2120
# Before building the docker image, first build and make a Spark distribution following
2221
# the instructions in http://spark.apache.org/docs/latest/building-spark.html.

resource-managers/kubernetes/docker/src/main/dockerfiles/executor/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
# limitations under the License.
1616
#
1717

18-
ARG base_image
19-
FROM ${base_image}
18+
FROM spark-base
2019

2120
# Before building the docker image, first build and make a Spark distribution following
2221
# the instructions in http://spark.apache.org/docs/latest/building-spark.html.

resource-managers/kubernetes/docker/src/main/dockerfiles/init-container/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
# limitations under the License.
1616
#
1717

18-
ARG base_image
19-
FROM ${base_image}
18+
FROM spark-base
2019

2120
# If this docker file is being used in the context of building your images from a Spark distribution, the docker build
2221
# command should be invoked from the top level directory of the Spark distribution. E.g.:

sbin/build-push-docker-images.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ function image_ref {
6060
}
6161

6262
function build {
63-
local base_image="$(image_ref spark-base 0)"
64-
docker build --build-arg "spark_jars=$SPARK_JARS" \
63+
docker build \
64+
--build-arg "spark_jars=$SPARK_JARS" \
6565
--build-arg "img_path=$IMG_PATH" \
66-
-t "$base_image" \
66+
-t spark-base \
6767
-f "$IMG_PATH/spark-base/Dockerfile" .
6868
for image in "${!path[@]}"; do
69-
docker build --build-arg "base_image=$base_image" -t "$(image_ref $image)" -f ${path[$image]} .
69+
docker build -t "$(image_ref $image)" -f ${path[$image]} .
7070
done
7171
}
7272

0 commit comments

Comments
 (0)