Skip to content

Commit

Permalink
Reordered instructions from docker/run/Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
TimSchneider42 committed May 24, 2024
1 parent f83ddfb commit 931ad86
Showing 1 changed file with 15 additions and 16 deletions.
31 changes: 15 additions & 16 deletions docker/run/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM ubuntu:22.04

LABEL maintainer="Tim Schneider <[email protected]>"

ARG LIBFRANKA_VERSION=0.13.3

ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y install build-essential cmake git libpoco-dev catch2 python3-dev

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

RUN git clone --recursive https://github.com/frankaemika/libfranka.git \
&& cd libfranka \
&& git checkout "${LIBFRANKA_VERSION}" \
# Cherry-pick missing imports commit
&& git config user.email "[email protected]" \
&& git config user.name "John Doe" \
&& if ! git merge-base --is-ancestor f1f46fb HEAD; then git cherry-pick -m 1 f1f46fb; fi \
&& git submodule update \
&& mkdir build && cd build \
&& cmake -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF .. \
&& make -j$(nproc) \
&& make install \
&& cd /tmp && rm -rf libfranka

RUN git clone https://github.com/catchorg/Catch2.git \
&& cd Catch2 \
&& git checkout v2.13.8 \
Expand All @@ -48,6 +32,21 @@ RUN git clone https://github.com/pybind/pybind11.git \
&& make install \
&& cd /tmp && rm -rf pybind11

ARG LIBFRANKA_VERSION=0.13.3
RUN git clone --recursive https://github.com/frankaemika/libfranka.git \
&& cd libfranka \
&& git checkout "${LIBFRANKA_VERSION}" \
# Cherry-pick missing imports commit
&& git config user.email "[email protected]" \
&& git config user.name "John Doe" \
&& if ! git merge-base --is-ancestor f1f46fb HEAD; then git cherry-pick -m 1 f1f46fb; fi \
&& git submodule update \
&& mkdir build && cd build \
&& cmake -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF .. \
&& make -j$(nproc) \
&& make install \
&& cd /tmp && rm -rf libfranka

RUN git clone https://github.com/TimSchneider42/franky.git --recurse-submodules \
&& cd franky \
&& mkdir build && cd build \
Expand Down

0 comments on commit 931ad86

Please sign in to comment.