Drop legacy images support (#617)

Author: uilianries

.ci/Jenkinsfile

@@ -41,17 +41,6 @@ String getImageMasterName(Map image) {
     return image["name"].replace("-PR${pr_number}", "").replace(conanVersion , "master")
 }
 
-def buildLegacyImage(Map image, String buildArgs, String registry, String registryCredentialsID, String cacheFrom) {
-    withCredentials([usernamePassword(credentialsId: registryCredentialsID, usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-        sh 'docker login --username $USERNAME --password $PASSWORD ' + "${registry}"
-        image["pull"].each {
-            sh "docker pull ${it} || true"
-        }
-    }
-
-    sh "docker build -t ${image["name"]} ${cacheFrom} ${buildArgs} ."
-}
-
 def uploadImage(Map image, String fromRegistryName, String toRegistryName, String crendentialsID) {
     withCredentials([usernamePassword(credentialsId: crendentialsID, usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
         sh 'docker login --username $USERNAME --password $PASSWORD ' + "${toRegistryName}"
@@ -68,68 +57,6 @@ def uploadImage(Map image, String fromRegistryName, String toRegistryName, Strin
     sh "docker push ${uploadImageName}"
 }
 
-def getLegacyImageName(Map imageData, String registry) {
-    // <registry>/<docker_username>/<compiler><compilerVersion>(-<suffix>):<conan_version>-PR<pr_number>
-    String name = "${imageData["dockerUsername"]}/${imageData["compiler"]}${imageData["compilerVersion"]}"
-    name = imageData["suffix"] != null ? "${name}-${imageData["suffix"]}" : name
-    String conanVersion = imageData["buildArgs"]["CONAN_VERSION"]
-    // <registry>/<docker_username>/<compiler><compilerVersion>(-<suffix>):<conan_version>-jdk<JDKVersion>-<JenkinsAgentVersion>-PR<pr_number>
-    String tag = imageData["suffix"] == "jenkins" ? "${conanVersion}-jdk${imageData["buildArgs"]["JAVA_JDK_VERSION"]}-${imageData["buildArgs"]["JENKINS_AGENT_VERSION"]}" : conanVersion
-    tag = "${tag}-PR${imageData["pr_number"]}"
-    return "${registry}/${name}:${tag}"
-}
-
-def getLegacyImages(String pr_number, String registry) {
-    Map<String, String> envValues = [:]
-    stage('Legacy - Parse environment file') {
-        envValues = readEnvValues("legacy/.env")
-    }
-
-    List<Map> images = []
-    stage('Legacy - Generate build matrix') {
-        final Map baseDockerImage = ["5": "docker.io/library/ubuntu:xenial", "7": "docker.io/library/ubuntu:bionic", "9": "docker.io/library/ubuntu:eoan"]
-        List<String> conanVersions = envValues["CONAN_VERSIONS"].split(",")
-
-        conanVersions.each({ String conanVersion ->
-            List<String> gccVersions = envValues["GCC_LEGACY_VERSIONS"].split(",")
-
-            gccVersions.each({ String gccVersion ->
-                String dockerUsername = envValues["DOCKER_USERNAME"]
-                String image = "${dockerUsername}/gcc${gccVersion}"
-                Map imageData = ["suffix": null, "buildArgs": [:], "target": null, "prefix": null, "cache": [], "pull": []]
-                imageData["dockerUsername"] = dockerUsername
-                imageData["compiler"] = "gcc"
-                imageData["compilerVersion"] = gccVersion
-                imageData["pr_number"] = pr_number
-                imageData["path"] = "legacy/gcc_${gccVersion}"
-                imageData["buildArgs"]["CONAN_VERSION"] = conanVersion
-                imageData["buildArgs"]["BUILDKIT_INLINE_CACHE"] = "1" // Enable BuildKit cache
-                imageData["name"] = getLegacyImageName(imageData, registry)
-                // pull images from registry to be used as cache
-                String masterImageName = getImageMasterName(imageData)
-                imageData["cache"] = [imageData["name"], masterImageName]
-                imageData["pull"] = [imageData["name"], masterImageName, baseDockerImage[gccVersion]]
-                images.add(imageData)
-
-                Map jenkinsImageData = imageData.clone()
-                jenkinsImageData["suffix"] = "jenkins"
-                jenkinsImageData["buildArgs"]["SOURCE_CONANIO_IMAGE"] = imageData["name"]
-                jenkinsImageData["buildArgs"]["JENKINS_AGENT_VERSION"] = envValues["JENKINS_AGENT_VERSION"]
-                jenkinsImageData["buildArgs"]["JAVA_JDK_VERSION"] = envValues["JAVA_JDK_VERSION"]
-                jenkinsImageData["path"] = "legacy/jenkins"
-                jenkinsImageData["name"] = getLegacyImageName(jenkinsImageData, registry)
-                // pull images from registry to be used as cache
-                String jenkinsImageMasterName = getImageMasterName(jenkinsImageData)
-                jenkinsImageData["cache"] = [jenkinsImageData["name"], jenkinsImageMasterName]
-                jenkinsImageData["pull"] = [jenkinsImageData["name"], imageData["name"], jenkinsImageMasterName]
-                images.add(jenkinsImageData)
-            })
-        })
-
-    }
-    return images
-}
-
 def getModernImageName(Map imageData, String registry) {
     if (imageData["prefix"] == "base") {
         // base: <registry>/<docker_username>/<prefix>-<distro>:<conan_version>-PR<pr_number>
@@ -152,7 +79,7 @@ def getModernImageName(Map imageData, String registry) {
 def defineModernBaseImageData(Map envValues, String pr_number, String registry, String conanVersion) {
     Map imageData = ["buildArgs": [:], "target": null, "suffix": null, "prefix": null , "pull": [], "cache": []]
     imageData["prefix"] = "base"
-    imageData["path"] = "modern/base"
+    imageData["path"] = "images/base"
     imageData['distro'] = envValues["DISTRO"]
     imageData["dockerUsername"] = envValues["DOCKER_USERNAME"]
     imageData["pr_number"] = pr_number
@@ -191,7 +118,7 @@ def defineModernImagesData(String compiler, String compilerVersion, Map envValue
     builderImage["buildArgs"]["CONAN_VERSION"] = conanVersion
     builderImage["buildArgs"]['DOCKER_TAG'] = "${conanVersion}-PR${pr_number}"
     builderImage["buildArgs"]["${compiler.toUpperCase()}_VERSION"] = envValues["${compiler.toUpperCase()}${compilerVersion}_VERSION"]
-    builderImage["path"] = "modern/${compiler}"
+    builderImage["path"] = "images/${compiler}"
     builderImage["suffix"] = "builder"
     builderImage["target"] = "builder"
     builderImage["name"] = getModernImageName(builderImage, registry)
@@ -218,7 +145,7 @@ def defineModernImagesData(String compiler, String compilerVersion, Map envValue
     jenkinsImage["buildArgs"]["SOURCE_CONANIO_IMAGE"] = deployImage["name"]
     jenkinsImage["buildArgs"]["JENKINS_AGENT_VERSION"] = envValues["JENKINS_AGENT_VERSION"]
     jenkinsImage["buildArgs"]["JAVA_JDK_VERSION"] = envValues["JAVA_JDK_VERSION"]
-    jenkinsImage["path"] = "modern/jenkins"
+    jenkinsImage["path"] = "images/jenkins"
     jenkinsImage["name"] = getModernImageName(jenkinsImage, registry)
     // pull images from registry to be used as cache
     String jenkinsImageMasterName = getImageMasterName(jenkinsImage)
@@ -233,7 +160,7 @@ def defineModernImagesData(String compiler, String compilerVersion, Map envValue
 def getModernImages(String pr_number, String registry) {
     Map<String, String> envValues = [:]
     stage('Modern - Parse environment file') {
-        envValues = readEnvValues("modern/.env")
+        envValues = readEnvValues("images/.env")
     }
 
     List<Map> images = []
@@ -257,43 +184,6 @@ def getModernImages(String pr_number, String registry) {
     return images
 }
 
-def buildLegacyImages(List<Map> images, String registry, String registryCredentialsID) {
-    // Define helper function to build the image
-    Closure imageBuild = { Map image ->
-        return {
-            node('Linux') {
-                String buildArgsStr = image["buildArgs"].collect({ k, v -> "--build-arg ${k }=${v }" }).join(' ') as String
-                String cacheFrom = image["cache"].collect({"--cache-from=${it}"}).join(' ') as String
-
-                environment {
-                    DOCKER_BUILDKIT = 1
-                    COMPOSE_DOCKER_CLI_BUILD = 0
-                }
-
-                stage('Legacy - Checkout sources') {
-                    checkout scm
-                }
-
-                stage("Legacy - Build image ${image["name"]}") {
-                    dir(image["path"]) {
-                        buildLegacyImage(image, buildArgsStr, registry, registryCredentialsID, cacheFrom)
-                    }
-                }
-
-                stage("Legacy - Upload image ${image["name"]} to Artifactory") {
-                    uploadImage(image, registry, registry, registryCredentialsID)
-                }
-            }
-        }
-    }
-
-    // Build images in parallel
-    List<Map> normalImages = images.findAll({ Map image -> !image["name"].contains("jenkins") })
-    List<Map> jenkinsImages = images.findAll({ Map image -> image["name"].contains("jenkins") })
-    buildParallel("Legacy image", normalImages, imageBuild)
-    buildParallel("Legacy image jenkins", jenkinsImages, imageBuild)
-}
-
 def buildParallel(String stageName, List images, Closure closure) {
     Map builds = [:]
     images.each { Map image ->
@@ -419,29 +309,22 @@ node('Linux') {
         return  // Outside stage
     }
 
-    List<Map> legacyImages = getLegacyImages(pr_number, "center-c3i-docker.jfrog.io")
-    echo "Legacy images: ${legacyImages}"
     List<Map> modernImages = getModernImages(pr_number, "center-c3i-docker.jfrog.io")
     echo "Modern images: ${modernImages}"
 
     if (!isMasterbranch) {
-        // Build Legacy Images
-        buildLegacyImages(legacyImages, "center-c3i-docker.jfrog.io", "center-c3i-docker")
-
         // Build Modern Images
         buildModernImages(modernImages, "center-c3i-docker.jfrog.io", "center-c3i-docker")
     }
 
     if (isMasterbranch) {
         // Tag images as definitive (without pr_number)
-        legacyImages = tagImagesWithoutPRNumber(legacyImages, pr_number, "center-c3i-docker.jfrog.io", "center-c3i-docker")
         modernImages = tagImagesWithoutPRNumber(modernImages, pr_number, "center-c3i-docker.jfrog.io", "center-c3i-docker")
 
         // Filter images to promote in hub.docker only. Do not promote base and builder images
         List<Map> modernDeployImages = modernImages.findAll({ Map image -> image["name"].contains("jenkins") || image["target"] == "deploy" })
 
         // Promote to dockerhub
-        promoteImages(legacyImages, "center-c3i-docker.jfrog.io", "center-c3i-docker", "docker.io", "docker-credentials")
         promoteImages(modernDeployImages, "center-c3i-docker.jfrog.io", "center-c3i-docker", "docker.io", "docker-credentials")
 
         // TODO: Clean images from PR that are in Artifactory

.ci/on_conan_release.jenkinsfile

@@ -9,21 +9,17 @@ node('Linux') {
         echo """
         - conan_version: ${params.conan_version}
         - build_new_images: ${params.build_new_images}
-        - build_old_images: ${params.build_old_images}
         """
     }
 
     stage('New docker images') {
         // Trigger the build
-        if (params.build_new_images || params.build_old_images) {
+        if (params.build_new_images) {
             // We need to wait for a while, to be sure that new release will be returned from the API
             sleep time: 120, unit: 'SECONDS'
             if (params.build_new_images) {
                 build(job: 'ConanCenterIndex', wait: false)
             }
-            if (params.build_old_images) {
-                build(job: 'ConanCenterIndexLegacy', wait: false)
-            }
         }
     }
 
@@ -38,15 +34,10 @@ node('Linux') {
                                        relativeTargetDir: 'conan-docker-tools']],
         ])
 
-        String content1 = readFile(file: 'conan-docker-tools/modern/.env')
+        String content1 = readFile(file: 'conan-docker-tools/images/.env')
         content1 = content1.replaceAll(/CONAN_VERSION=\d+\.\d+.\d+/, "CONAN_VERSION=${params.conan_version}")
         content1 = content1.replaceAll(/DOCKER_TAG=\d+\.\d+.\d+/, "DOCKER_TAG=${params.conan_version}")
-        writeFile(file: 'conan-docker-tools/modern/.env', text: content1)
-
-        String content2 = readFile(file: 'conan-docker-tools/legacy/.env')
-        content2 = content2.replaceAll(/CONAN_VERSION=\d+\.\d+.\d+/, "CONAN_VERSION=${params.conan_version}")
-        content2 = content2.replaceAll(/DOCKER_BUILD_TAG=\d+\.\d+.\d+/, "DOCKER_BUILD_TAG=${params.conan_version}")
-        writeFile(file: 'conan-docker-tools/legacy/.env', text: content2)
+        writeFile(file: 'conan-docker-tools/images/.env', text: content1)
 
         String branchName = "bot/release-${params.conan_version}".replaceAll(/\./, '_')
         dir('conan-docker-tools') {

.gitignore

@@ -4,4 +4,4 @@
 __pycache__/
 _venv/
 .idea/
-modern/tests/tmp/
+images/tests/tmp/

README.md

@@ -10,6 +10,8 @@
 Dockerfiles for different GCC and Clang compiler versions.
 You can use these images directly in your project or with the [conan-package-tools project](https://github.com/conan-io/conan-package-tools).
 
+### Note about Conan Docker Tools
+
 > :warning: **Warning:**
 The images listed below are intended for **generating open-source library packages** and we cannot guarantee any kind of stability. We strongly recommend using your own generated images for production environments taking the dockerfiles in this repository as a reference.
 
@@ -26,26 +28,15 @@ $ docker run -it conanio/gcc11-ubuntu16.04:2.2.2
 
 ### Storage and availability
 
-First, check what images are still maintained in the [legacy](legacy/README.md#official-docker-images) and [modern](modern/README.md#official-docker-images) folder.
+First, [images](images/README.md#official-docker-images) folder.
 
 All public images are stored in the Docker Hub under the `conanio` organization. You can find them [here](https://hub.docker.com/r/conanio/).
 
 Also, there is a copy for each image used internally by ConanCenterIndexCI. These images are private and consumed by the Jenkins server. It keeps the images up-to-date, avoiding the Docker Hub rate limit and network delays.
 
-### Legacy and Modern images
-
-There are two main folders which store our Dockerfiles [legacy](legacy/) and [modern](modern/).
-
-#### Legacy
-
-As the name suggests, they are our legacy, a few images are still used by Conan Center, and all of them are superseded by the Moderns images.
-Please, read the table below to understand which images are still maintained. All images produced by legacy only contain the compiler name, version, and arch, e.g. `conanio/gcc10`, `conan/gcc7-armv7hf`
-Also, all non-x64 images are no longer supported. Because we do not use them on Conan Center, we do not have maintainers/experts enough to keep them, and we have only a few users looking for them.
-For personal projects, avoid the legacy folder.
-
-#### Modern
+#### Images
 
-The Modern folder stores our new design, re-using the same Dockerfile for any compiler version. Consider this folder for new projects, as we will maintain it for a long period. All images generated by modern design are named using the compiler name, version, distro and its version, e.g. `conanio/gcc11-ubuntu16.04`. Only x64 is supported. Please, read the issue [#205](https://github.com/conan-io/conan-docker-tools/issues/205) to obtain more information about our decision related to design, distro version, glibc support, system package and compilers.
+The images folder stores our new design, re-using the same Dockerfile for any compiler version. Consider this folder for new projects, as we will maintain it for a long period. All images generated by modern design are named using the compiler name, version, distro and its version, e.g. `conanio/gcc11-ubuntu16.04`. Only x64 is supported. Please, read the issue [#205](https://github.com/conan-io/conan-docker-tools/issues/205) to obtain more information about our decision related to design, distro version, glibc support, system package and compilers.
 
 ### LICENSE
 

bump_version.py

@@ -19,6 +19,6 @@ def update_versions(file_path, new_version):
 
     args = parser.parse_args()
 
-    for file_path in ['legacy/.env', 'modern/.env']:
+    for file_path in ['images/.env']:
         update_versions(file_path, args.conan_version)
         print(f"Updated CONAN_VERSION and DOCKER_TAG to {args.conan_version} in {file_path}")

modern/.env images/.env

@@ -1,4 +1,4 @@
-CONAN_VERSIONS=2.9.1,1.65.0
+CONAN_VERSIONS=2.9.1
 CONAN_VERSION=2.9.1
 
 DOCKER_TAG=2.9.1