Skip to content

Commit

Permalink
Merge branch 'master' of github.com:mfussi66/icub-forward-kinematics-…
Browse files Browse the repository at this point in the history
…inspection
  • Loading branch information
mfussi66 committed Jul 12, 2021
2 parents 61bbff2 + 81b2612 commit ce36025
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 3 additions & 2 deletions dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ 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

# Set up git (required by superbuild)
RUN git config --global user.name "GitHub Actions" && \
Expand All @@ -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/ && \
Expand Down
4 changes: 1 addition & 3 deletions dockerfiles/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ce36025

Please sign in to comment.