cleanup docker env variables

KumarRobotics · Nov 20, 2024 · 39a3684 · 39a3684
1 parent c5fc712
commit 39a3684
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 9 deletions.
diff --git a/utils/docker/base_images/ubuntu22.04/Dockerfile b/utils/docker/base_images/ubuntu22.04/Dockerfile
@@ -71,6 +71,7 @@ RUN mkdir download; \
 		unzip download/libtorch.zip -d /opt/; \
 		rm -r download
 
+ENV LD_LIBRARY_PATH="/usr/local/lib:/opt/libtorch/lib"
 ENV Torch_DIR=/opt/libtorch/share/cmake/
 
 COPY requirements_cpu.txt /opt/requirements.txt
@@ -80,4 +81,3 @@ RUN /opt/venv/bin/pip install --no-cache-dir -r /opt/requirements.txt
 ENV VENV_PATH=/opt/venv
 
 COPY .bashrc /root/.bashrc
-RUN echo 'LD_LIBRARY_PATH=/usr/local/lib:/opt/libtorch/lib:${LD_LIBRARY_PATH}' >> /root/.bashrc
diff --git a/utils/docker/base_images/ubuntu22.04/arm64-ros2.Dockerfile b/utils/docker/base_images/ubuntu22.04/arm64-ros2.Dockerfile
@@ -76,7 +76,7 @@ RUN mkdir download; \
 		unzip download/libtorch.zip -d /opt/; \
 		rm -r download
 
-RUN echo 'LD_LIBRARY_PATH=/usr/local/lib:/opt/libtorch/lib:${LD_LIBRARY_PATH}' >> /etc/environment
+ENV LD_LIBRARY_PATH="/usr/local/lib:/opt/libtorch/lib"
 ENV Torch_DIR=/opt/libtorch/share/cmake/
 
 COPY requirements_cpu.txt /opt/requirements.txt
@@ -87,4 +87,3 @@ RUN /opt/venv/bin/pip install --no-cache-dir catkin_pkg empy==3.3.4 lark
 ENV VENV_PATH=/opt/venv
 
 COPY .ros.humble.bashrc /root/.bashrc
-RUN echo 'LD_LIBRARY_PATH=/usr/local/lib:/opt/libtorch/lib:${LD_LIBRARY_PATH}' >> /root/.bashrc
diff --git a/utils/docker/base_images/ubuntu22.04/cuda-ros2.Dockerfile b/utils/docker/base_images/ubuntu22.04/cuda-ros2.Dockerfile
@@ -75,6 +75,7 @@ RUN mkdir download; \
 		unzip download/libtorch.zip -d /opt/; \
 		rm -r download
 
+ENV LD_LIBRARY_PATH="/usr/local/lib:/opt/libtorch/lib"
 ENV Torch_DIR=/opt/libtorch/share/cmake/
 
 COPY requirements.txt /opt/requirements.txt
@@ -85,4 +86,3 @@ RUN /opt/venv/bin/pip install --no-cache-dir catkin_pkg empy==3.3.4 lark tomli
 ENV VENV_PATH=/opt/venv
 
 COPY .ros.humble.bashrc /root/.bashrc
-RUN echo 'LD_LIBRARY_PATH=/usr/local/lib:/opt/libtorch/lib:${LD_LIBRARY_PATH}' >> /root/.bashrc
diff --git a/utils/docker/base_images/ubuntu22.04/cuda.Dockerfile b/utils/docker/base_images/ubuntu22.04/cuda.Dockerfile
@@ -71,6 +71,7 @@ RUN mkdir download; \
 		unzip download/libtorch.zip -d /opt/; \
 		rm -r download
 
+ENV LD_LIBRARY_PATH="/usr/local/lib:/opt/libtorch/lib"
 ENV Torch_DIR=/opt/libtorch/share/cmake/
 
 COPY requirements.txt /opt/requirements.txt
@@ -80,4 +81,3 @@ RUN /opt/venv/bin/pip install --no-cache-dir -r /opt/requirements.txt
 ENV VENV_PATH=/opt/venv
 
 COPY .bashrc /root/.bashrc
-RUN echo 'LD_LIBRARY_PATH=/usr/local/lib:/opt/libtorch/lib:${LD_LIBRARY_PATH}' >> /root/.bashrc
diff --git a/utils/docker/base_images/ubuntu22.04/ros2.Dockerfile b/utils/docker/base_images/ubuntu22.04/ros2.Dockerfile
@@ -76,6 +76,7 @@ RUN mkdir download; \
 		unzip download/libtorch.zip -d /opt/; \
 		rm -r download
 
+ENV LD_LIBRARY_PATH="/usr/local/lib:/opt/libtorch/lib"
 ENV Torch_DIR=/opt/libtorch/share/cmake/
 
 COPY requirements_cpu.txt /opt/requirements.txt
@@ -86,4 +87,3 @@ RUN /opt/venv/bin/pip install --no-cache-dir catkin_pkg empy==3.3.4 lark tomli
 ENV VENV_PATH=/opt/venv
 
 COPY .ros.humble.bashrc /root/.bashrc
-RUN echo 'LD_LIBRARY_PATH=/usr/local/lib:/opt/libtorch/lib:${LD_LIBRARY_PATH}' >> /root/.bashrc
diff --git a/utils/docker/base_images/ubuntu24.04/Dockerfile b/utils/docker/base_images/ubuntu24.04/Dockerfile
@@ -72,4 +72,3 @@ RUN /opt/venv/bin/pip install --no-cache-dir -r /opt/requirements.txt
 ENV VENV_PATH=/opt/venv
 
 COPY .bashrc /root/.bashrc
-RUN echo 'LD_LIBRARY_PATH=/usr/local/lib:/opt/libtorch/lib:${LD_LIBRARY_PATH}' >> /root/.bashrc
diff --git a/utils/docker/base_images/ubuntu24.04/arm64-ros2.Dockerfile b/utils/docker/base_images/ubuntu24.04/arm64-ros2.Dockerfile
@@ -70,7 +70,7 @@ RUN mkdir download; \
 		unzip download/libtorch.zip -d /opt/; \
 		rm -r download
 
-RUN echo 'LD_LIBRARY_PATH=/usr/local/lib:/opt/libtorch/lib:${LD_LIBRARY_PATH}' >> /etc/environment
+ENV LD_LIBRARY_PATH="/usr/local/lib:/opt/libtorch/lib"
 ENV Torch_DIR=/opt/libtorch/share/cmake/
 
 COPY requirements_cpu.txt /opt/requirements.txt
@@ -81,4 +81,3 @@ RUN /opt/venv/bin/pip install --no-cache-dir catkin_pkg lark
 ENV VENV_PATH=/opt/venv
 
 COPY .ros.jazzy.bashrc /root/.bashrc
-RUN echo 'LD_LIBRARY_PATH=/usr/local/lib:/opt/libtorch/lib:${LD_LIBRARY_PATH}' >> /root/.bashrc
Original file line number	Diff line number	Diff line change
Expand Up		@@ -72,4 +72,3 @@ RUN /opt/venv/bin/pip install --no-cache-dir -r /opt/requirements.txt
		ENV VENV_PATH=/opt/venv

		COPY .bashrc /root/.bashrc
		RUN echo 'LD_LIBRARY_PATH=/usr/local/lib:/opt/libtorch/lib:${LD_LIBRARY_PATH}' >> /root/.bashrc