Skip to content

Commit 931ad86

Browse files
Reordered instructions from docker/run/Dockerfile
1 parent f83ddfb commit 931ad86

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

docker/run/Dockerfile

+15-16
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ FROM ubuntu:22.04
22

33
LABEL maintainer="Tim Schneider <tim@robot-learning.de>"
44

5-
ARG LIBFRANKA_VERSION=0.13.3
6-
75
ENV DEBIAN_FRONTEND=noninteractive
86
RUN apt-get update && apt-get -y install build-essential cmake git libpoco-dev catch2 python3-dev
97

@@ -17,20 +15,6 @@ RUN git clone https://gitlab.com/libeigen/eigen.git \
1715
&& make install \
1816
&& cd /tmp && rm -rf eigen
1917

20-
RUN git clone --recursive https://github.com/frankaemika/libfranka.git \
21-
&& cd libfranka \
22-
&& git checkout "${LIBFRANKA_VERSION}" \
23-
# Cherry-pick missing imports commit
24-
&& git config user.email "john.doe@example.com" \
25-
&& git config user.name "John Doe" \
26-
&& if ! git merge-base --is-ancestor f1f46fb HEAD; then git cherry-pick -m 1 f1f46fb; fi \
27-
&& git submodule update \
28-
&& mkdir build && cd build \
29-
&& cmake -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF .. \
30-
&& make -j$(nproc) \
31-
&& make install \
32-
&& cd /tmp && rm -rf libfranka
33-
3418
RUN git clone https://github.com/catchorg/Catch2.git \
3519
&& cd Catch2 \
3620
&& git checkout v2.13.8 \
@@ -48,6 +32,21 @@ RUN git clone https://github.com/pybind/pybind11.git \
4832
&& make install \
4933
&& cd /tmp && rm -rf pybind11
5034

35+
ARG LIBFRANKA_VERSION=0.13.3
36+
RUN git clone --recursive https://github.com/frankaemika/libfranka.git \
37+
&& cd libfranka \
38+
&& git checkout "${LIBFRANKA_VERSION}" \
39+
# Cherry-pick missing imports commit
40+
&& git config user.email "john.doe@example.com" \
41+
&& git config user.name "John Doe" \
42+
&& if ! git merge-base --is-ancestor f1f46fb HEAD; then git cherry-pick -m 1 f1f46fb; fi \
43+
&& git submodule update \
44+
&& mkdir build && cd build \
45+
&& cmake -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF .. \
46+
&& make -j$(nproc) \
47+
&& make install \
48+
&& cd /tmp && rm -rf libfranka
49+
5150
RUN git clone https://github.com/TimSchneider42/franky.git --recurse-submodules \
5251
&& cd franky \
5352
&& mkdir build && cd build \

0 commit comments

Comments
 (0)