Skip to content

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

Closed
foxish wants to merge 2 commits into
apache:masterfrom
foxish:patch-1
Closed

[SPARK-22866] [K8S] Fix path issue in Kubernetes dockerfile#20051
foxish wants to merge 2 commits into
apache:masterfrom
foxish:patch-1

Conversation

@foxish

@foxishfoxish commented Dec 22, 2017

Copy link
Copy Markdown
Contributor

What changes were proposed in this pull request?

The path was recently changed in #19946, but the dockerfile was not updated.
This is a trivial 1 line fix.

How was this patch tested?

./sbin/build-push-docker-images.sh -r spark-repo -t latest build

cc/ @vanzin@mridulm@rxin@jiangxb1987@liyinan926

The path was recently changed in apache#19946, but the dockerfile was not updated.
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
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@foxishfoxishDec 22, 2017

Copy link
Copy Markdown
ContributorAuthor

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.

@mridulm

mridulm commented Dec 22, 2017

Copy link
Copy Markdown
Contributor

A grep indicates this is the full list:

  • ./resource-managers/kubernetes/docker/src/main/dockerfiles/driver/Dockerfile:# docker build -t spark-driver:latest -f dockerfiles/spark-base/Dockerfile .
  • ./resource-managers/kubernetes/docker/src/main/dockerfiles/spark-base/Dockerfile:# docker build -t spark-base:latest -f dockerfiles/spark-base/Dockerfile .
  • ./resource-managers/kubernetes/docker/src/main/dockerfiles/spark-base/Dockerfile:COPY dockerfiles/spark-base/entrypoint.sh /opt/
  • ./resource-managers/kubernetes/docker/src/main/dockerfiles/executor/Dockerfile:# docker build -t spark-executor:latest -f dockerfiles/spark-base/Dockerfile .

@foxish

Copy link
Copy Markdown
ContributorAuthor

@mridulm thanks for looking into it! Looks like I missed updating the dockerfile comments. On it.

@foxish

foxish commented Dec 22, 2017

Copy link
Copy Markdown
ContributorAuthor

Done, comments updated. I'm setting up CI on the Kubernetes test infrastructure this week - should help catch these issues early on in future.

@mridulm

Copy link
Copy Markdown
Contributor

Merged, thanks @foxish

@foxish
foxish deleted the patch-1 branch December 22, 2017 05:10
@SparkQA

Copy link
Copy Markdown

Test build #85294 has finished for PR 20051 at commit f631331.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA

Copy link
Copy Markdown

Test build #85297 has finished for PR 20051 at commit 657b48a.

  • This patch fails due to an unknown error code, -9.
  • This patch merges cleanly.
  • This patch adds no public classes.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@foxish@mridulm@SparkQA