From adfa909a291b8f6155b359fad13c5fe41f17cca5 Mon Sep 17 00:00:00 2001
From: Diego Ferigo <diego.ferigo@iit.it>
Date: Mon, 7 Sep 2020 09:13:49 +0200
Subject: [PATCH 1/2] Use upstream colcon release file

---
 .docker/cicd-devel.Dockerfile |  4 +--
 .docker/tags_citadel.yaml     | 61 -----------------------------------
 2 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 .docker/tags_citadel.yaml

diff --git a/.docker/cicd-devel.Dockerfile b/.docker/cicd-devel.Dockerfile
index 43aa2986a..9ef426057 100644
--- a/.docker/cicd-devel.Dockerfile
+++ b/.docker/cicd-devel.Dockerfile
@@ -67,11 +67,11 @@ RUN pip3 install vcstool colcon-common-extensions &&\
 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 \
diff --git a/.docker/tags_citadel.yaml b/.docker/tags_citadel.yaml
deleted file mode 100644
index babacb228..000000000
--- a/.docker/tags_citadel.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-repositories:
-  ign-cmake:
-    type: git
-    url: https://github.com/ignitionrobotics/ign-cmake
-    version: ign-cmake2
-  ign-common:
-    type: git
-    url: https://github.com/ignitionrobotics/ign-common
-    version: ign-common3
-  ign-fuel-tools:
-    type: git
-    url: https://github.com/ignitionrobotics/ign-fuel-tools
-    version: ign-fuel-tools4
-  ign-gazebo:
-    type: git
-    url: https://github.com/diegoferigo/ign-gazebo
-    version: feature/paused-step
-  ign-gui:
-    type: git
-    url: https://github.com/ignitionrobotics/ign-gui
-    version: ign-gui3
-  ign-launch:
-    type: git
-    url: https://github.com/ignitionrobotics/ign-launch
-    version: ign-launch2
-  ign-math:
-    type: git
-    url: https://github.com/ignitionrobotics/ign-math
-    version: ign-math6
-  ign-msgs:
-    type: git
-    url: https://github.com/ignitionrobotics/ign-msgs
-    version: ign-msgs5
-  ign-physics:
-    type: git
-    url: https://github.com/ignitionrobotics/ign-physics
-    version: ign-physics2
-  ign-plugin:
-    type: git
-    url: https://github.com/ignitionrobotics/ign-plugin
-    version: ign-plugin1
-  ign-rendering:
-    type: git
-    url: https://github.com/ignitionrobotics/ign-rendering
-    version: ign-rendering3
-  ign-sensors:
-    type: git
-    url: https://github.com/ignitionrobotics/ign-sensors
-    version: ign-sensors3
-  ign-tools:
-    type: git
-    url: https://github.com/ignitionrobotics/ign-tools
-    version: ign-tools1
-  ign-transport:
-    type: git
-    url: https://github.com/ignitionrobotics/ign-transport
-    version: ign-transport8
-  sdformat:
-    type: git
-    url: https://github.com/osrf/sdformat
-    version: sdf9

From 12ef8bc048b90cf3ed3972ea6ec06ec19c273f45 Mon Sep 17 00:00:00 2001
From: Diego Ferigo <diego.ferigo@iit.it>
Date: Mon, 7 Sep 2020 09:19:20 +0200
Subject: [PATCH 2/2] Disable static compilation of ign-gazebo

since it does not work anyway when both the static and dynamic version of protobuf are loaded by the OS
---
 .docker/cicd-devel.Dockerfile | 11 -----------
 .docker/docker-compose.yml    |  2 --
 2 files changed, 13 deletions(-)

diff --git a/.docker/cicd-devel.Dockerfile b/.docker/cicd-devel.Dockerfile
index 9ef426057..88a272300 100644
--- a/.docker/cicd-devel.Dockerfile
+++ b/.docker/cicd-devel.Dockerfile
@@ -64,7 +64,6 @@ 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"
 
@@ -75,22 +74,12 @@ RUN mkdir -p /workspace/src &&\
     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
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index c45f65f35..c8407aa93 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -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
@@ -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