Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker images to use upstream's colcon yaml #239

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions .docker/cicd-devel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,33 +64,22 @@ RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-${IGNITION_DEFAULT
RUN pip3 install vcstool colcon-common-extensions &&\
rm -r $HOME/.cache/pip

ARG BUILD_SHARED_LIBS="ON"
ARG CMAKE_BUILD_TYPE="Release"
ARG ignition_codename="citadel"
ADD tags_${ignition_codename}.yaml /tmp/tags.yaml

RUN mkdir -p /workspace/src &&\
cd /workspace/src &&\
vcs import < /tmp/tags.yaml &&\
wget https://raw.githubusercontent.com/ignition-tooling/gazebodistro/master/collection-${ignition_codename}.yaml &&\
vcs import < collection-${ignition_codename}.yaml &&\
cd /workspace &&\
colcon graph &&\
colcon build \
--packages-end ignition-sensors3 \
--cmake-args \
-GNinja \
-DBUILD_TESTING:BOOL=OFF \
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
--merge-install \
&&\
colcon build \
--packages-start ignition-gazebo3 \
--cmake-args \
-GNinja \
-DBUILD_TESTING:BOOL=OFF \
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \
--merge-install \
&&\
echo "source /workspace/install/setup.bash" >> /etc/bash.bashrc

COPY entrypoint.sh /entrypoint.sh
Expand Down
2 changes: 0 additions & 2 deletions .docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ services:
from: diegoferigo/gym-ignition:base
ignition_codename: citadel
CMAKE_BUILD_TYPE: Debug
BUILD_SHARED_LIBS: "ON"
context: .
dockerfile: cicd-devel.Dockerfile
image: diegoferigo/gym-ignition:ci-devel
Expand All @@ -53,7 +52,6 @@ services:
from: diegoferigo/gym-ignition:base
ignition_codename: citadel
CMAKE_BUILD_TYPE: Release
BUILD_SHARED_LIBS: "OFF"
context: .
dockerfile: cicd-devel.Dockerfile
image: diegoferigo/gym-ignition:pypi-devel
Expand Down
61 changes: 0 additions & 61 deletions .docker/tags_citadel.yaml

This file was deleted.