Cleanup CI images, add distro release and version

Author: bthomee

docker/debian/Dockerfile

@@ -131,8 +131,8 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 EOT
 EOF
 
@@ -212,8 +212,8 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 EOT
 EOF
 

docker/rhel/Dockerfile

@@ -97,8 +97,8 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 EOT
 EOF
 
@@ -161,8 +161,8 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["RHEL", "${RHEL_VERSION}"]
 EOT
 EOF
 

docker/ubuntu/Dockerfile

@@ -115,8 +115,8 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 EOT
 EOF
 
@@ -191,8 +191,8 @@ EOF
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
-tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
+tools.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 EOT
 EOF