Skip to content

Commit

Permalink
Merge pull request robotology#3103 from elandini84/feature/dockerfile…
Browse files Browse the repository at this point in the history
…/parameters

Parameters for Dockerfile
  • Loading branch information
randaz81 authored Apr 19, 2024
2 parents 2ae5b42 + 7850927 commit 93ac24d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
5 changes: 5 additions & 0 deletions doc/release/master.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ New Features

* Added LLM_Message data type to propagate LLM answers

#### Docker
* Added two parameters to yarp `Dockerfile`:
* `base_img` to allow starting from different parent images
* `yarp_branch` to set the yarp version the users might need in their image

### Devices

#### controlboardremapper
Expand Down
6 changes: 4 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:22.04
ARG base_img=ubuntu:22.04
FROM ${base_img}
LABEL maintainer="Marco Randazzo"

# Non-interactive installation mode
Expand Down Expand Up @@ -116,9 +117,10 @@ RUN cd ycm && mkdir build && cd build && \
ENV YCM_DIR=/home/user1/robotology/ycm/build

# Build YARP
ARG yarp_branch=master
USER $robotology_install_user
WORKDIR $robotology_install_folder
RUN git clone https://github.com/robotology/yarp.git -b master
RUN git clone https://github.com/robotology/yarp.git -b ${yarp_branch}
RUN cd yarp && mkdir build && cd build && \
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
Expand Down

0 comments on commit 93ac24d

Please sign in to comment.