Temporarily switch to dockerhub for CI jobs (backport #1908)

[mergify]

This is an automatic backport of pull request #1908 done by Mergify.
Cherry-pick of 39d3714 has failed:

On branch mergify/bp/humble/pr-1908
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 39d371453.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .docker/source/Dockerfile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .docker/ci-testing/Dockerfile
	both modified:   .github/workflows/ci.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio refresh will re-evaluate the rules
• @Mergifyio rebase will rebase this PR on its base branch
• @Mergifyio update will merge the base branch into this PR
• @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

[adlarkin]

@vatanaksoytezer pinging you here just in case you want to take a look. We are trying to make CI green on the humble branch as well (see #2040)

[adlarkin]

Should this also incorporate the changes from #2035?

Suggested change

	ARG ROS_DISTRO=rolling
	<<<<<<< HEAD
	FROM osrf/ros2:testing
	=======
	FROM moveit/moveit2:${ROS_DISTRO}-ci
	>>>>>>> 39d371453 (Temporarily switch to dockerhub for CI jobs (#1908))
	LABEL maintainer Robert Haschke [email protected]
	ENV TERM xterm
	FROM osrf/ros2:testing
	LABEL maintainer Robert Haschke [email protected]
	ENV TERM xterm
	# Overwrite the ROS_DISTRO set in osrf/ros2:testing to the distro tied to this Dockerfile (OUR_ROS_DISTRO).
	# In case ROS_DISTRO is now different from what was set in osrf/ros2:testing, run `rosdep update` again
	# to get any missing dependencies.
	# https://docs.docker.com/engine/reference/builder/#using-arg-variables explains why ARG and ENV can't have
	# the same name (ROS_DISTRO is an ENV in the osrf/ros2:testing image).
	ARG OUR_ROS_DISTRO=rolling
	ENV ROS_DISTRO=${OUR_ROS_DISTRO}
	RUN rosdep update --rosdistro $ROS_DISTRO

[adlarkin]

If the changes from #2035 are made here as well, the corresponding github workflow build arg should be renamed to OUR_ROS_DISTRO: https://github.com/ros-planning/moveit2/blob/mergify/bp/humble/pr-1908/.github/workflows/docker.yaml#L134

[adlarkin]

Suggested change

	<<<<<<< HEAD
	DOCKER_IMAGE: ghcr.io/ros-planning/moveit2:${{ matrix.env.IMAGE }}
	UPSTREAM_WORKSPACE: moveit2.repos $(f="moveit2_$(sed 's/-.*$//' <<< "${{ matrix.env.IMAGE }}").repos"; test -r $f && echo $f)
	=======
	DOCKER_IMAGE: moveit/moveit2:${{ matrix.env.IMAGE }}
	UPSTREAM_WORKSPACE: >
	moveit2.repos
	$(f="moveit2_$(sed 's/-.*$//' <<< "${{ matrix.env.IMAGE }}").repos"; test -r $f && echo $f)
	>>>>>>> 39d371453 (Temporarily switch to dockerhub for CI jobs (#1908))
	DOCKER_IMAGE: moveit/moveit2:${{ matrix.env.IMAGE }}
	UPSTREAM_WORKSPACE: >
	moveit2.repos
	$(f="moveit2_$(sed 's/-.*$//' <<< "${{ matrix.env.IMAGE }}").repos"; test -r $f && echo $f)

[vatanaksoytezer]

@adlarkin thank you for the ping. Please feel free to close this and open a new PR with the changes you want. I might not have time to look at this in the next few days. (Sorry extremely busy week)

[adlarkin]

No worries, sorry for the delay on my end as well - I have just opened a replacement PR and will close this one: see #2081