Skip to content

[SPARK-22866] [K8S] Fix path issue in Kubernetes dockerfile #20051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[SPARK-22866] [K8S] Fix path issue in Kubernetes dockerfile #20051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f631331
[SPARK-22866] [K8S] Fix path issue in Kubernetes dockerfile
foxish Dec 22, 2017
657b48a
Update comments in Dockerfiles
foxish Dec 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/docker/src/main/dockerfiles/driver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM spark-base
# If this docker file is being used in the context of building your images from a Spark
# distribution, the docker build command should be invoked from the top level directory
# of the Spark distribution. E.g.:
# docker build -t spark-driver:latest -f dockerfiles/spark-base/Dockerfile .
# docker build -t spark-driver:latest -f kubernetes/dockerfiles/spark-base/Dockerfile .

COPY examples /opt/spark/examples

Expand Down
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/docker/src/main/dockerfiles/executor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM spark-base
# If this docker file is being used in the context of building your images from a Spark
# distribution, the docker build command should be invoked from the top level directory
# of the Spark distribution. E.g.:
# docker build -t spark-executor:latest -f dockerfiles/spark-base/Dockerfile .
# docker build -t spark-executor:latest -f kubernetes/dockerfiles/spark-base/Dockerfile .

COPY examples /opt/spark/examples

Expand Down
4 changes: 2 additions & 2 deletions resource-managers/kubernetes/docker/src/main/dockerfiles/spark-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM openjdk:8-alpine
# If this docker file is being used in the context of building your images from a Spark
# distribution, the docker build command should be invoked from the top level directory
# of the Spark distribution. E.g.:
# docker build -t spark-base:latest -f dockerfiles/spark-base/Dockerfile .
# docker build -t spark-base:latest -f kubernetes/dockerfiles/spark-base/Dockerfile .

RUN set -ex && \
apk upgrade --no-cache && \
Expand All @@ -38,7 +38,7 @@ COPY jars /opt/spark/jars
COPY bin /opt/spark/bin
COPY sbin /opt/spark/sbin
COPY conf /opt/spark/conf
COPY dockerfiles/spark-base/entrypoint.sh /opt/
COPY kubernetes/dockerfiles/spark-base/entrypoint.sh /opt/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean this ? https://github.com/apache/spark/pull/19946/files#diff-cb1784535ec45c5b890bb16c5971be65R26

Copy link
Contributor Author

@foxish foxish Dec 22, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, to elaborate, on our fork, we used to have dockerfiles/ in the root of the built distribution. But now, it's copied to kubernetes/dockerfiles which is a more logical place, since there is a yarn/ in the distribution as well.


ENV SPARK_HOME /opt/spark

Expand Down