Skip to content

[SPARK-26685][K8S] Correct placement of ARG declaration #23611

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
rvesse wants to merge 2 commits into from
Closed

[SPARK-26685][K8S] Correct placement of ARG declaration #23611

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
53d037a
[SPARK-26685][K8S] Correct placement of ARG declaration
rvesse Jan 22, 2019
0ee1c3b
[SPARK-26685][K8S] Fix -u <uid> not propagating to Python/R bindings
rvesse Jan 22, 2019
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
3 changes: 2 additions & 1 deletion bin/docker-image-tool.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,11 @@ function build {
fi

local BINDING_BUILD_ARGS=(
${BUILD_PARAMS}
${BUILD_ARGS[@]}
--build-arg
base_img=$(image_ref spark)
)

local BASEDOCKERFILE=${BASEDOCKERFILE:-"kubernetes/dockerfiles/spark/Dockerfile"}
local PYDOCKERFILE=${PYDOCKERFILE:-false}
local RDOCKERFILE=${RDOCKERFILE:-false}
Expand Down
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/R/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#

ARG base_img
ARG spark_uid=185

FROM $base_img
WORKDIR /
Expand All @@ -35,4 +34,5 @@ WORKDIR /opt/spark/work-dir
ENTRYPOINT [ "/opt/entrypoint.sh" ]

# Specify the User that the actual main process will run as
ARG spark_uid=185
USER ${spark_uid}
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/python/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#

ARG base_img
ARG spark_uid=185

FROM $base_img
WORKDIR /
Expand Down Expand Up @@ -46,4 +45,5 @@ WORKDIR /opt/spark/work-dir
ENTRYPOINT [ "/opt/entrypoint.sh" ]

# Specify the User that the actual main process will run as
ARG spark_uid=185
USER ${spark_uid}