Undo alphabetical ordering to avoid possible unexpected behavior

Author: bthomee

docker/debian/Dockerfile

@@ -139,8 +139,8 @@ EOF
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
-tools.info.package_id:confs=["user.package:distro"]
 user.package:distro="debian-${DEBIAN_VERSION}"
+tools.info.package_id:confs=["user.package:distro"]
 EOT
 EOF
 
@@ -228,8 +228,8 @@ EOF
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
-tools.info.package_id:confs=["user.package:distro"]
 user.package:distro="debian-${DEBIAN_VERSION}"
+tools.info.package_id:confs=["user.package:distro"]
 EOT
 EOF
 

docker/rhel/Dockerfile

@@ -109,8 +109,8 @@ EOF
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
-tools.info.package_id:confs=["user.package:distro"]
 user.package:distro="rhel-${RHEL_VERSION}"
+tools.info.package_id:confs=["user.package:distro"]
 EOT
 EOF
 
@@ -184,8 +184,8 @@ EOF
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
-tools.info.package_id:confs=["user.package:distro"]
 user.package:distro="rhel-${RHEL_VERSION}"
+tools.info.package_id:confs=["user.package:distro"]
 EOT
 EOF
 

docker/ubuntu/Dockerfile

@@ -125,8 +125,8 @@ EOF
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
-tools.info.package_id:confs=["user.package:distro"]
 user.package:distro="ubuntu-${UBUNTU_VERSION}"
+tools.info.package_id:confs=["user.package:distro"]
 EOT
 EOF
 
@@ -211,8 +211,8 @@ EOF
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
-tools.info.package_id:confs=["user.package:distro"]
 user.package:distro="ubuntu-${UBUNTU_VERSION}"
+tools.info.package_id:confs=["user.package:distro"]
 EOT
 EOF