Cleanup CI images, add distro release and version

Author: bthomee

docker/debian/Dockerfile

@@ -131,7 +131,7 @@ 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.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
 EOT
 EOF
@@ -212,7 +212,7 @@ 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.info.package_id:confs+=["Debian", "${DEBIAN_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
 EOT
 EOF

docker/ubuntu/Dockerfile

@@ -115,7 +115,7 @@ 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.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
 EOT
 EOF
@@ -191,7 +191,7 @@ 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.info.package_id:confs+=["Ubuntu", "${UBUNTU_VERSION}"]
 tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
 EOT
 EOF