This is an automated email from the ASF dual-hosted git repository.
maxgekk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 788fa5ad1fe8 [SPARK-50609][INFRA] Eliminate warnings in docker image
building
788fa5ad1fe8 is described below
commit 788fa5ad1fe8286ae762321087aae8a1a5b0fe0d
Author: panbingkun <[email protected]>
AuthorDate: Wed Dec 18 17:55:22 2024 +0300
[SPARK-50609][INFRA] Eliminate warnings in docker image building
### What changes were proposed in this pull request?
The pr aims to eliminate warnings in docker image building
```shell
- LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy
"ENV key value" format (line 75)
- LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy
"ENV key value" format (line 27)
- LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy
"ENV key value" format (line 29)
- LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy
"ENV key value" format (line 30)
```
### Why are the changes needed?
- Eliminate warnings
- Alignment of environment variable declarations for other `dockerfile`
files in the code repository
https://github.com/apache/spark/blob/229118ca7a127753635543909efdb27601985d42/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile#L63
https://github.com/apache/spark/blob/229118ca7a127753635543909efdb27601985d42/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/R/Dockerfile#L40
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
- Pass GA.
- Manually check.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #49224 from panbingkun/SPARK-50609.
Authored-by: panbingkun <[email protected]>
Signed-off-by: Max Gekk <[email protected]>
---
binder/Dockerfile | 4 ++--
dev/create-release/spark-rm/Dockerfile | 8 ++++----
dev/infra/Dockerfile | 8 ++++----
dev/spark-test-image/docs/Dockerfile | 8 ++++----
dev/spark-test-image/lint/Dockerfile | 8 ++++----
dev/spark-test-image/pypy-310/Dockerfile | 6 +++---
dev/spark-test-image/python-309/Dockerfile | 6 +++---
dev/spark-test-image/python-310/Dockerfile | 6 +++---
dev/spark-test-image/python-311/Dockerfile | 6 +++---
dev/spark-test-image/python-312/Dockerfile | 6 +++---
dev/spark-test-image/python-313/Dockerfile | 6 +++---
dev/spark-test-image/sparkr/Dockerfile | 8 ++++----
12 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/binder/Dockerfile b/binder/Dockerfile
index 6e3dd9155fb7..2d5c30a9a92e 100644
--- a/binder/Dockerfile
+++ b/binder/Dockerfile
@@ -22,8 +22,8 @@ RUN pip install --no-cache notebook jupyterlab
# create user with a home directory
ARG NB_USER
ARG NB_UID
-ENV USER ${NB_USER}
-ENV HOME /home/${NB_USER}
+ENV USER=${NB_USER}
+ENV HOME=/home/${NB_USER}
RUN adduser --disabled-password \
--gecos "Default user" \
diff --git a/dev/create-release/spark-rm/Dockerfile
b/dev/create-release/spark-rm/Dockerfile
index ae6b7cfea6f2..190c82429e29 100644
--- a/dev/create-release/spark-rm/Dockerfile
+++ b/dev/create-release/spark-rm/Dockerfile
@@ -23,10 +23,10 @@ LABEL org.opencontainers.image.ref.name="Apache Spark
Release Manager Image"
# Overwrite this label to avoid exposing the underlying Ubuntu OS version label
LABEL org.opencontainers.image.version=""
-ENV FULL_REFRESH_DATE 20240318
+ENV FULL_REFRESH_DATE=20240318
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN=true
RUN apt-get update && apt-get install -y \
build-essential \
@@ -88,7 +88,7 @@ RUN Rscript -e "install.packages(c('devtools', 'knitr',
'markdown', \
Rscript -e "devtools::install_version('preferably', version='0.4',
repos='https://cloud.r-project.org')"
# See more in SPARK-39735
-ENV R_LIBS_SITE
"/usr/local/lib/R/site-library:${R_LIBS_SITE}:/usr/lib/R/library"
+ENV
R_LIBS_SITE="/usr/local/lib/R/site-library:${R_LIBS_SITE}:/usr/lib/R/library"
RUN add-apt-repository ppa:pypy/ppa
diff --git a/dev/infra/Dockerfile b/dev/infra/Dockerfile
index 99cd887c6b6e..9cd6031023ca 100644
--- a/dev/infra/Dockerfile
+++ b/dev/infra/Dockerfile
@@ -24,10 +24,10 @@ LABEL org.opencontainers.image.ref.name="Apache Spark Infra
Image"
# Overwrite this label to avoid exposing the underlying Ubuntu OS version label
LABEL org.opencontainers.image.version=""
-ENV FULL_REFRESH_DATE 20241119
+ENV FULL_REFRESH_DATE=20241119
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN=true
RUN apt-get update && apt-get install -y \
build-essential \
@@ -82,7 +82,7 @@ RUN Rscript -e "install.packages(c('devtools', 'knitr',
'markdown', \
Rscript -e "devtools::install_version('preferably', version='0.4',
repos='https://cloud.r-project.org')"
# See more in SPARK-39735
-ENV R_LIBS_SITE
"/usr/local/lib/R/site-library:${R_LIBS_SITE}:/usr/lib/R/library"
+ENV
R_LIBS_SITE="/usr/local/lib/R/site-library:${R_LIBS_SITE}:/usr/lib/R/library"
RUN add-apt-repository ppa:pypy/ppa
diff --git a/dev/spark-test-image/docs/Dockerfile
b/dev/spark-test-image/docs/Dockerfile
index 0f3559fa2d4c..6b087f08281c 100644
--- a/dev/spark-test-image/docs/Dockerfile
+++ b/dev/spark-test-image/docs/Dockerfile
@@ -24,10 +24,10 @@ LABEL org.opencontainers.image.ref.name="Apache Spark Infra
Image for Documentat
# Overwrite this label to avoid exposing the underlying Ubuntu OS version label
LABEL org.opencontainers.image.version=""
-ENV FULL_REFRESH_DATE 20241029
+ENV FULL_REFRESH_DATE=20241029
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN=true
RUN apt-get update && apt-get install -y \
build-essential \
@@ -72,7 +72,7 @@ RUN Rscript -e "install.packages(c('devtools', 'knitr',
'markdown', 'rmarkdown',
Rscript -e "devtools::install_version('preferably', version='0.4',
repos='https://cloud.r-project.org')"
# See more in SPARK-39735
-ENV R_LIBS_SITE
"/usr/local/lib/R/site-library:${R_LIBS_SITE}:/usr/lib/R/library"
+ENV
R_LIBS_SITE="/usr/local/lib/R/site-library:${R_LIBS_SITE}:/usr/lib/R/library"
# Install Python 3.9
RUN add-apt-repository ppa:deadsnakes/ppa
diff --git a/dev/spark-test-image/lint/Dockerfile
b/dev/spark-test-image/lint/Dockerfile
index f9ea3124291b..c663c3dac3b9 100644
--- a/dev/spark-test-image/lint/Dockerfile
+++ b/dev/spark-test-image/lint/Dockerfile
@@ -24,10 +24,10 @@ LABEL org.opencontainers.image.ref.name="Apache Spark Infra
Image for Linter"
# Overwrite this label to avoid exposing the underlying Ubuntu OS version label
LABEL org.opencontainers.image.version=""
-ENV FULL_REFRESH_DATE 20241112
+ENV FULL_REFRESH_DATE=20241112
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN=true
RUN apt-get update && apt-get install -y \
build-essential \
@@ -63,7 +63,7 @@ RUN Rscript -e "install.packages(c('devtools', 'knitr',
'markdown', 'rmarkdown',
&& Rscript -e "devtools::install_version('lintr', version='2.0.1',
repos='https://cloud.r-project.org')" \
# See more in SPARK-39735
-ENV R_LIBS_SITE
"/usr/local/lib/R/site-library:${R_LIBS_SITE}:/usr/lib/R/library"
+ENV
R_LIBS_SITE="/usr/local/lib/R/site-library:${R_LIBS_SITE}:/usr/lib/R/library"
# Install Python 3.9
RUN add-apt-repository ppa:deadsnakes/ppa
diff --git a/dev/spark-test-image/pypy-310/Dockerfile
b/dev/spark-test-image/pypy-310/Dockerfile
index 7d6ff26566de..6a309d38f1d5 100644
--- a/dev/spark-test-image/pypy-310/Dockerfile
+++ b/dev/spark-test-image/pypy-310/Dockerfile
@@ -24,10 +24,10 @@ LABEL org.opencontainers.image.ref.name="Apache Spark Infra
Image For PySpark wi
# Overwrite this label to avoid exposing the underlying Ubuntu OS version label
LABEL org.opencontainers.image.version=""
-ENV FULL_REFRESH_DATE 20241212
+ENV FULL_REFRESH_DATE=20241212
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN=true
RUN apt-get update && apt-get install -y \
build-essential \
diff --git a/dev/spark-test-image/python-309/Dockerfile
b/dev/spark-test-image/python-309/Dockerfile
index 2b4d5bc25801..bfe23bf572ad 100644
--- a/dev/spark-test-image/python-309/Dockerfile
+++ b/dev/spark-test-image/python-309/Dockerfile
@@ -24,10 +24,10 @@ LABEL org.opencontainers.image.ref.name="Apache Spark Infra
Image For PySpark wi
# Overwrite this label to avoid exposing the underlying Ubuntu OS version label
LABEL org.opencontainers.image.version=""
-ENV FULL_REFRESH_DATE 20241205
+ENV FULL_REFRESH_DATE=20241205
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN=true
RUN apt-get update && apt-get install -y \
build-essential \
diff --git a/dev/spark-test-image/python-310/Dockerfile
b/dev/spark-test-image/python-310/Dockerfile
index 26748dd26b06..b9875ba969f8 100644
--- a/dev/spark-test-image/python-310/Dockerfile
+++ b/dev/spark-test-image/python-310/Dockerfile
@@ -24,10 +24,10 @@ LABEL org.opencontainers.image.ref.name="Apache Spark Infra
Image For PySpark wi
# Overwrite this label to avoid exposing the underlying Ubuntu OS version label
LABEL org.opencontainers.image.version=""
-ENV FULL_REFRESH_DATE 20241205
+ENV FULL_REFRESH_DATE=20241205
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN=true
RUN apt-get update && apt-get install -y \
build-essential \
diff --git a/dev/spark-test-image/python-311/Dockerfile
b/dev/spark-test-image/python-311/Dockerfile
index 33956b05b2d3..48f1fede03c0 100644
--- a/dev/spark-test-image/python-311/Dockerfile
+++ b/dev/spark-test-image/python-311/Dockerfile
@@ -24,10 +24,10 @@ LABEL org.opencontainers.image.ref.name="Apache Spark Infra
Image For PySpark wi
# Overwrite this label to avoid exposing the underlying Ubuntu OS version label
LABEL org.opencontainers.image.version=""
-ENV FULL_REFRESH_DATE 20241212
+ENV FULL_REFRESH_DATE=20241212
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN=true
RUN apt-get update && apt-get install -y \
build-essential \
diff --git a/dev/spark-test-image/python-312/Dockerfile
b/dev/spark-test-image/python-312/Dockerfile
index 29ec14290c4b..0a8d5b79a361 100644
--- a/dev/spark-test-image/python-312/Dockerfile
+++ b/dev/spark-test-image/python-312/Dockerfile
@@ -24,10 +24,10 @@ LABEL org.opencontainers.image.ref.name="Apache Spark Infra
Image For PySpark wi
# Overwrite this label to avoid exposing the underlying Ubuntu OS version label
LABEL org.opencontainers.image.version=""
-ENV FULL_REFRESH_DATE 20241206
+ENV FULL_REFRESH_DATE=20241206
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN=true
RUN apt-get update && apt-get install -y \
build-essential \
diff --git a/dev/spark-test-image/python-313/Dockerfile
b/dev/spark-test-image/python-313/Dockerfile
index 50d634b72602..473f3df8fdb7 100644
--- a/dev/spark-test-image/python-313/Dockerfile
+++ b/dev/spark-test-image/python-313/Dockerfile
@@ -24,10 +24,10 @@ LABEL org.opencontainers.image.ref.name="Apache Spark Infra
Image For PySpark wi
# Overwrite this label to avoid exposing the underlying Ubuntu OS version label
LABEL org.opencontainers.image.version=""
-ENV FULL_REFRESH_DATE 20241210
+ENV FULL_REFRESH_DATE=20241210
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN=true
RUN apt-get update && apt-get install -y \
build-essential \
diff --git a/dev/spark-test-image/sparkr/Dockerfile
b/dev/spark-test-image/sparkr/Dockerfile
index 43260c714a55..3312c0852bd7 100644
--- a/dev/spark-test-image/sparkr/Dockerfile
+++ b/dev/spark-test-image/sparkr/Dockerfile
@@ -24,10 +24,10 @@ LABEL org.opencontainers.image.ref.name="Apache Spark Infra
Image for SparkR"
# Overwrite this label to avoid exposing the underlying Ubuntu OS version label
LABEL org.opencontainers.image.version=""
-ENV FULL_REFRESH_DATE 20241114
+ENV FULL_REFRESH_DATE=20241114
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN=true
RUN apt-get update && apt-get install -y \
build-essential \
@@ -74,4 +74,4 @@ RUN Rscript -e "install.packages(c('devtools', 'knitr',
'markdown', \
Rscript -e "devtools::install_version('preferably', version='0.4',
repos='https://cloud.r-project.org')"
# See more in SPARK-39735
-ENV R_LIBS_SITE
"/usr/local/lib/R/site-library:${R_LIBS_SITE}:/usr/lib/R/library"
+ENV
R_LIBS_SITE="/usr/local/lib/R/site-library:${R_LIBS_SITE}:/usr/lib/R/library"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
