Remove user settings with distro

Author: bthomee

docker/debian/Dockerfile

@@ -69,8 +69,7 @@ RUN pipx install --pip-args='--no-cache' conan==${CONAN_VERSION} && \
 # ====================== GCC IMAGE ======================
 FROM base AS gcc
 
-# These are not inherited from base image.
-ARG DEBIAN_VERSION
+# These are not inherited from the base image.
 ARG DEBIAN_FRONTEND=noninteractive
 ARG GCC_VERSION
 
@@ -133,16 +132,6 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Add the distribution name and version, so they can be taken into account when
-# building dependencies. This requires setting the `os` field in the activated
-# profile where this image is used to the appropriate value.
-RUN <<EOF
-cat >> $(conan config home)/settings_user.yml <<EOT
-os:
-  debian-${DEBIAN_VERSION}:
-EOT
-EOF
-
 # Explicitly set the compiler flags.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
@@ -164,7 +153,7 @@ EOF
 # ===================== CLANG IMAGE =====================
 FROM base AS clang
 
-# These are not inherited from base image.
+# These are not inherited from the base image.
 ARG DEBIAN_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -228,16 +217,6 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Add the distribution name and version, so they can be taken into account when
-# building dependencies. This requires setting the `os` field in the activated
-# profile where this image is used to the appropriate value.
-RUN <<EOF
-cat >> $(conan config home)/settings_user.yml <<EOT
-os:
-  debian-${DEBIAN_VERSION}:
-EOT
-EOF
-
 # Explicitly set the compiler flags and the distribution name and version.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT

docker/rhel/Dockerfile

@@ -42,9 +42,6 @@ RUN pip install --no-cache conan==${CONAN_VERSION} gcovr==${GCOVR_VERSION}
 # ====================== GCC IMAGE ======================
 FROM base AS gcc
 
-# This is not inherited from base image.
-ARG RHEL_VERSION
-
 # Install GCC. Red Hat installs GCC as a Software Collection (SCL) package,
 # where typically you would run `scl enable gcc-toolset-X` to open another Bash
 # shell with the GCC toolset enabled. To avoid having to do so, we delete the
@@ -103,16 +100,6 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Add the distribution name and version, so they can be taken into account when
-# building dependencies. This requires setting the `os` field in the activated
-# profile where this image is used to the appropriate value.
-RUN <<EOF
-cat >> $(conan config home)/settings_user.yml <<EOT
-os:
-  rhel-${RHEL_VERSION}:
-EOT
-EOF
-
 # Explicitly set the compiler flags.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
@@ -134,9 +121,6 @@ EOF
 # ===================== CLANG IMAGE =====================
 FROM base AS clang
 
-# This is not inherited from base image.
-ARG RHEL_VERSION
-
 # Install Clang. Note that in the RHEL UBIs, we cannot choose the Clang version
 # to install and we get what is available. Some build dependencies require GCC
 # to be also available.
@@ -184,16 +168,6 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Add the distribution name and version, so they can be taken into account when
-# building dependencies. This requires setting the `os` field in the activated
-# profile where this image is used to the appropriate value.
-RUN <<EOF
-cat >> $(conan config home)/settings_user.yml <<EOT
-os:
-  rhel-${RHEL_VERSION}:
-EOT
-EOF
-
 # Explicitly set the compiler flags.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT

docker/ubuntu/Dockerfile

@@ -58,8 +58,7 @@ RUN pipx install --pip-args='--no-cache' conan==${CONAN_VERSION} && \
 # ====================== GCC IMAGE ======================
 FROM base AS gcc
 
-# These are not inherited from base image.
-ARG UBUNTU_VERSION
+# This is not inherited from the base image.
 ARG DEBIAN_FRONTEND=noninteractive
 
 # Install GCC and create the necessary symlinks. We only support packaging with
@@ -119,16 +118,6 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Add the distribution name and version, so they can be taken into account when
-# building dependencies. This requires setting the `os` field in the activated
-# profile where this image is used to the appropriate value.
-RUN <<EOF
-cat >> $(conan config home)/settings_user.yml <<EOT
-os:
-  ubuntu-${UBUNTU_VERSION}:
-EOT
-EOF
-
 # Explicitly set the compiler flags.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT
@@ -150,8 +139,7 @@ EOF
 # ===================== CLANG IMAGE =====================
 FROM base AS clang
 
-# These are not inherited from base image.
-ARG UBUNTU_VERSION
+# This is not inherited from the base image.
 ARG DEBIAN_FRONTEND=noninteractive
 
 # Install Clang. Some build dependencies require GCC to be also available.
@@ -211,16 +199,6 @@ conan profile detect
 rm -rf /tmp/*
 EOF
 
-# Add the distribution name and version, so they can be taken into account when
-# building dependencies. This requires setting the `os` field in the activated
-# profile where this image is used to the appropriate value.
-RUN <<EOF
-cat >> $(conan config home)/settings_user.yml <<EOT
-os:
-  ubuntu-${UBUNTU_VERSION}:
-EOT
-EOF
-
 # Explicitly set the compiler flags.
 RUN <<EOF
 cat >> $(conan config home)/global.conf <<EOT