Skip to content

Commit 4d4ed0e

Browse files
authored
Unify ENV command in Dockerfiles (#2135)
1 parent a966c0a commit 4d4ed0e

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

docs/using/recipe_code/microsoft_odbc.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
66

77
USER root
88

9-
ENV MSSQL_DRIVER "ODBC Driver 18 for SQL Server"
9+
ENV MSSQL_DRIVER="ODBC Driver 18 for SQL Server"
1010
ENV PATH="/opt/mssql-tools18/bin:${PATH}"
1111

1212
RUN apt-get update --yes && \

docs/using/recipe_code/oracledb.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ RUN wget --progress=dot:giga "${INSTANTCLIENT_URL}/oracle-instantclient-basiclit
3434

3535
# And configure variables
3636
RUN echo "ORACLE_HOME=/usr/lib/oracle/${INSTANTCLIENT_MAJOR_VERSION}/client64" >> "${HOME}/.bashrc" && \
37-
echo "PATH=${ORACLE_HOME}/bin:${PATH}" >> "${HOME}/.bashrc" && \
38-
echo "LD_LIBRARY_PATH=${ORACLE_HOME}/lib:${LD_LIBRARY_PATH}" >> "${HOME}/.bashrc" && \
37+
echo "PATH=\"${ORACLE_HOME}/bin:${PATH}\"" >> "${HOME}/.bashrc" && \
38+
echo "LD_LIBRARY_PATH=\"${ORACLE_HOME}/lib:${LD_LIBRARY_PATH}\"" >> "${HOME}/.bashrc" && \
3939
echo "export ORACLE_HOME" >> "${HOME}/.bashrc" && \
4040
echo "export PATH" >> "${HOME}/.bashrc" && \
4141
echo "export LD_LIBRARY_PATH" >> "${HOME}/.bashrc"

docs/using/recipes.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,10 +301,10 @@ This recipe is not tested and might be broken.
301301
FROM quay.io/jupyter/all-spark-notebook
302302

303303
# Set env vars for pydoop
304-
ENV HADOOP_HOME /usr/local/hadoop-2.7.3
305-
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
306-
ENV HADOOP_CONF_HOME /usr/local/hadoop-2.7.3/etc/hadoop
307-
ENV HADOOP_CONF_DIR /usr/local/hadoop-2.7.3/etc/hadoop
304+
ENV HADOOP_HOME=/usr/local/hadoop-2.7.3
305+
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
306+
ENV HADOOP_CONF_HOME=/usr/local/hadoop-2.7.3/etc/hadoop
307+
ENV HADOOP_CONF_DIR=/usr/local/hadoop-2.7.3/etc/hadoop
308308

309309
USER root
310310
# Add proper open-jdk-8 not the jre only, needed for pydoop

images/all-spark-notebook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1414
USER root
1515

1616
# RSpark config
17-
ENV R_LIBS_USER "${SPARK_HOME}/R/lib"
17+
ENV R_LIBS_USER="${SPARK_HOME}/R/lib"
1818
RUN fix-permissions "${R_LIBS_USER}"
1919

2020
# R pre-requisites

images/docker-stacks-foundation/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ USER root
2020

2121
# Install all OS dependencies for the Server that starts
2222
# but lacks all features (e.g., download as all possible file formats)
23-
ENV DEBIAN_FRONTEND noninteractive
23+
ENV DEBIAN_FRONTEND=noninteractive
2424
RUN apt-get update --yes && \
2525
# - `apt-get upgrade` is run to patch known vulnerabilities in system packages
2626
# as the Ubuntu base image is rebuilt too seldom sometimes (less than once a month)

images/pytorch-notebook/cuda11/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ RUN pip install --no-cache-dir --extra-index-url=https://pypi.nvidia.com --index
2121
fix-permissions "/home/${NB_USER}"
2222

2323
# https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/docker-specialized.html#dockerfiles
24-
ENV NVIDIA_VISIBLE_DEVICES all
25-
ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
24+
ENV NVIDIA_VISIBLE_DEVICES="all" \
25+
NVIDIA_DRIVER_CAPABILITIES="compute,utility"
2626

2727
# Puts the nvidia-smi binary (system management interface) on path
2828
# with associated library files to execute it
29-
ENV PATH=${PATH}:/usr/local/nvidia/bin
30-
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/nvidia/lib64
29+
ENV PATH="${PATH}:/usr/local/nvidia/bin" \
30+
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/nvidia/lib64"

images/pytorch-notebook/cuda12/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ RUN pip install --no-cache-dir --extra-index-url=https://pypi.nvidia.com --index
2121
fix-permissions "/home/${NB_USER}"
2222

2323
# https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/docker-specialized.html#dockerfiles
24-
ENV NVIDIA_VISIBLE_DEVICES all
25-
ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
24+
ENV NVIDIA_VISIBLE_DEVICES="all" \
25+
NVIDIA_DRIVER_CAPABILITIES="compute,utility"
2626

2727
# Puts the nvidia-smi binary (system management interface) on path
2828
# with associated library files to execute it
29-
ENV PATH=${PATH}:/usr/local/nvidia/bin
30-
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/nvidia/lib64
29+
ENV PATH="${PATH}:/usr/local/nvidia/bin" \
30+
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/nvidia/lib64"

images/tensorflow-notebook/cuda/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ ENV NVIDIA_VISIBLE_DEVICES="all" \
3232

3333
# Puts the nvidia-smi binary (system management interface) on path
3434
# with associated library files to execute it
35-
ENV PATH=${PATH}:/usr/local/nvidia/bin
36-
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/nvidia/lib64
35+
ENV PATH="${PATH}:/usr/local/nvidia/bin" \
36+
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/nvidia/lib64"

0 commit comments

Comments
 (0)