Merge pull request #13 from tiiuae/use_fog_ros_baseimage

Use fog ros baseimage

.github/workflows/main.yaml

@@ -9,9 +9,6 @@ on:
 jobs:
   tii-px4-msgs-deb:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ros2_distro: [foxy, galactic]
     steps:
       - name: Checkout PX4-msgs
         uses: actions/checkout@v2
@@ -22,8 +19,6 @@ jobs:
           set -eux
           mkdir bin
           pushd PX4-msgs
-          export ROS=1
-          export ROS_DISTRO=${{ matrix.ros2_distro }}
           ./build.sh ../bin/
           popd
       - name: Upload build

Dockerfile

@@ -0,0 +1,14 @@
+FROM ghcr.io/tiiuae/fog-ros-baseimage:builder-3dcb78d
+
+ARG BUILD_NUMBER
+
+COPY . /main_ws/src/
+
+# this:
+# 1) builds the application
+# 2) packages the application as .deb in /main_ws/
+
+RUN /packaging/build.sh -b ${BUILD_NUMBER}
+
+RUN mkdir -p /output_dir
+RUN cp /main_ws/ros-*-px4-msgs_*_amd64.deb /output_dir/

build.sh

@@ -3,38 +3,14 @@
 set -euxo pipefail
 
 output_dir=$1
-
-git_commit_hash=${2:-$(git rev-parse HEAD)}
-
-git_version_string=${3:-$(git log --date=format:%Y%m%d --pretty=~git%cd.%h -n 1)}
-
 build_number=${GITHUB_RUN_NUMBER:=0}
 
-ros_distro=${ROS_DISTRO:=foxy}
-
-iname=${PACKAGE_NAME:=px4-msgs}
-
-iversion=${PACKAGE_VERSION:=latest}
-
 docker build \
-  --build-arg UID=$(id -u) \
-  --build-arg GID=$(id -g) \
-  --build-arg ROS_DISTRO=${ros_distro} \
-  --build-arg PACKAGE_NAME=${iname} \
-  --pull \
-  -f Dockerfile.build_env -t "${iname}_build:${iversion}" .
-
-docker run \
-  --rm \
-  -v $(pwd):/${iname}/sources \
-  ${iname}_build:${iversion} \
-  ./packaging/package.sh \
-  -b ${build_number} \
-  -g ${git_commit_hash} \
-  -v ${git_version_string}
+    --build-arg BUILD_NUMBER=${build_number} \
+    -t "tii-px4-msgs:px4-msgs" .
 
-mkdir -p ${output_dir}
-cp *.deb *.ddeb ${output_dir}
-rm -Rf *.deb *.ddeb
+container_id=$(docker create tii-px4-msgs:px4-msgs)
+docker cp ${container_id}:/output_dir/. ${output_dir}
+docker rm -v ${container_id}
 
 exit 0