Skip to content

Commit 1458f79

Browse files
committed
add cache date to dockerfiles
1 parent 58958bb commit 1458f79

File tree

3 files changed

+27
-4
lines changed

3 files changed

+27
-4
lines changed

docker/aarch64.dockerfile

+11-2
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ RUN pip3 install trimesh \
128128
rosdep \
129129
empy
130130

131+
# Add cache date to avoid using cached layers older than this
132+
ARG CACHE_DATE=2023-12-15
133+
131134
# warp from https://github.com/NVIDIA/warp needs to be compiled locally and then
132135
# placed in curobo/docker/pkgs.
133136
# Run the following from your terminal:
@@ -149,10 +152,12 @@ ENV TORCH_CUDA_ARCH_LIST "7.0+PTX"
149152

150153
RUN cd /pkgs/curobo && pip3 install . --no-build-isolation
151154

155+
WORKDIR /pkgs/curobo
156+
152157
# Optionally install nvblox:
153158

154159
RUN apt-get update && \
155-
apt-get install -y libgoogle-glog-dev libgtest-dev curl libsqlite3-dev && \
160+
apt-get install -y libgoogle-glog-dev libgtest-dev curl libsqlite3-dev libbenchmark-dev && \
156161
cd /usr/src/googletest && cmake . && cmake --build . --target install && \
157162
rm -rf /var/lib/apt/lists/*
158163

@@ -164,5 +169,9 @@ RUN cd /pkgs && git clone https://github.com/valtsblukis/nvblox.git && \
164169

165170
RUN cd /pkgs && git clone https://github.com/nvlabs/nvblox_torch.git && \
166171
cd nvblox_torch && \
167-
sh install.sh
172+
sh install.sh $(python -c 'import torch.utils; print(torch.utils.cmake_prefix_path)')
173+
174+
RUN python -m pip install "robometrics[evaluator] @ git+https://github.com/fishbotics/robometrics.git"
168175

176+
# upgrade typing extensions:
177+
RUN python3 -m pip install typing-extensions --upgrade

docker/isaac_sim.dockerfile

+7
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,10 @@ ENV omni_python='/isaac-sim/python.sh'
159159

160160
RUN echo "alias omni_python='/isaac-sim/python.sh'" >> /.bashrc
161161

162+
163+
# Add cache date to avoid using cached layers older than this
164+
ARG CACHE_DATE=2023-12-15
165+
162166
RUN $omni_python -m pip install "robometrics[evaluator] @ git+https://github.com/fishbotics/robometrics.git"
163167

164168
# if you want to use a different version of curobo, create folder as docker/pkgs and put your
@@ -174,6 +178,8 @@ RUN $omni_python -m pip install ninja wheel tomli
174178

175179
RUN cd /pkgs/curobo && $omni_python -m pip install .[dev] --no-build-isolation
176180

181+
WORKDIR /pkgs/curobo
182+
177183
# Optionally install nvblox:
178184

179185
RUN apt-get update && \
@@ -246,4 +252,5 @@ RUN cd /pkgs && git clone https://github.com/nvlabs/nvblox_torch.git && \
246252
# install realsense for nvblox demos:
247253
RUN $omni_python -m pip install pyrealsense2 opencv-python transforms3d
248254

255+
RUN $omni_python -m pip install "robometrics[evaluator] @ git+https://github.com/fishbotics/robometrics.git"
249256

docker/x86.dockerfile

+9-2
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/hpcx/ompi/lib"
7777
ENV TORCH_CUDA_ARCH_LIST "7.0+PTX"
7878
ENV LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}"
7979

80+
# Add cache date to avoid using cached layers older than this
81+
ARG CACHE_DATE=2023-12-15
82+
8083

8184
RUN pip install "robometrics[evaluator] @ git+https://github.com/fishbotics/robometrics.git"
8285

@@ -103,7 +106,7 @@ ENV PYOPENGL_PLATFORM=egl
103106
RUN echo '{"file_format_version": "1.0.0", "ICD": {"library_path": "libEGL_nvidia.so.0"}}' >> /usr/share/glvnd/egl_vendor.d/10_nvidia.json
104107

105108
RUN apt-get update && \
106-
apt-get install -y libgoogle-glog-dev libgtest-dev curl libsqlite3-dev && \
109+
apt-get install -y libgoogle-glog-dev libgtest-dev curl libsqlite3-dev libbenchmark-dev && \
107110
cd /usr/src/googletest && cmake . && cmake --build . --target install && \
108111
rm -rf /var/lib/apt/lists/*
109112

@@ -115,6 +118,10 @@ RUN cd /pkgs && git clone https://github.com/valtsblukis/nvblox.git && \
115118

116119
RUN cd /pkgs && git clone https://github.com/nvlabs/nvblox_torch.git && \
117120
cd nvblox_torch && \
118-
sh install.sh
121+
sh install.sh $(python -c 'import torch.utils; print(torch.utils.cmake_prefix_path)') && \
122+
python3 -m pip install -e .
119123

120124
RUN python -m pip install pyrealsense2 opencv-python transforms3d
125+
126+
# install benchmarks:
127+
RUN python -m pip install "robometrics[evaluator] @ git+https://github.com/fishbotics/robometrics.git"

0 commit comments

Comments
 (0)