From 44008087a7835a54ebe56e2099c239f8d2d96b49 Mon Sep 17 00:00:00 2001 From: Ugo Pattacini Date: Fri, 9 Jul 2021 17:25:11 +0200 Subject: [PATCH 1/3] Turn the fork into a parameter No need for passing this as further argument right now. However, it is better to consider that the recipe could be employed with different forks as well. cc @mfussi66 --- dockerfiles/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 21109e6..94389e3 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -50,6 +50,7 @@ RUN sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb ARG ROBOTOLOGY_SUPERBUILD_RELEASE ARG BUILD_TYPE ARG ROBOTOLOGY_SUPERBUILD_INSTALL_DIR=/usr/local +ARG FORK=mfussi66/icub-main # Set up git (required by superbuild) RUN git config --global user.name "GitHub Actions" && \ @@ -68,7 +69,7 @@ RUN git clone https://github.com/robotology/robotology-superbuild.git --depth 1 # Download and build fork of icub-main RUN cd /robotology-superbuild/src/ICUB && \ - git remote add fork https://github.com/mfussi66/icub-main.git && \ + git remote add fork https://github.com/${FORK}.git && \ git fetch fork && \ git checkout -b fork-master --track fork/master && \ cd /robotology-superbuild/build/ && \ From 192e2d8381453264adc26748631591459bfe83b2 Mon Sep 17 00:00:00 2001 From: Ugo Pattacini Date: Fri, 9 Jul 2021 17:26:23 +0200 Subject: [PATCH 2/3] Update Dockerfile --- dockerfiles/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 94389e3..7e08539 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -48,7 +48,7 @@ RUN sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb # Select options ARG ROBOTOLOGY_SUPERBUILD_RELEASE -ARG BUILD_TYPE +ARG BUILD_TYPE=Release ARG ROBOTOLOGY_SUPERBUILD_INSTALL_DIR=/usr/local ARG FORK=mfussi66/icub-main From 81b2612cb39e26067490955418478f965aeba787 Mon Sep 17 00:00:00 2001 From: Ugo Pattacini Date: Fri, 9 Jul 2021 17:26:43 +0200 Subject: [PATCH 3/3] Update README.md --- dockerfiles/README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dockerfiles/README.md b/dockerfiles/README.md index 4234c4d..76e76f2 100644 --- a/dockerfiles/README.md +++ b/dockerfiles/README.md @@ -6,9 +6,7 @@ Make sure you have [Docker](https://docs.docker.com/get-docker) available on you 1. Build the docker image: ```console cd dockerfiles - docker build . --build-arg ROBOTOLOGY_SUPERBUILD_RELEASE=releases/2021.05 \ - --build-arg BUILD_TYPE=Release \ - --tag icub-fkin-inspection + docker build . --build-arg ROBOTOLOGY_SUPERBUILD_RELEASE=releases/2021.05 --tag icub-fkin-inspection ``` 2. Launch the container: ```console