Skip to content
Snippets Groups Projects
Commit 53db9731 authored by Patrick MADELA's avatar Patrick MADELA
Browse files

Merge branch 'develop' into 'main'

New images naming convention and fix build with buildah

See merge request !1
parents 31ca36c7 f9435bd4
Branches
Tags
1 merge request!1New images naming convention and fix build with buildah
Pipeline #9291 passed
Pipeline: dev-docker-tools

#9296

    Pipeline: dev-docker-tools

    #9295

      Pipeline: dev-docker-tools

      #9294

        +2
        Showing
        with 244 additions and 177 deletions
        stages:
        - triggers
        ......@@ -25,8 +26,8 @@ dev-el7-gcc48-x86:
        include: dev-el7-gcc48-x86/.gitlab-ci.yml
        strategy: depend
        dev-el9-gcc115:
        dev-el9-gcc11:
        stage: triggers
        trigger:
        include: dev-el9-gcc115/.gitlab-ci.yml
        include: dev-el9-gcc11/.gitlab-ci.yml
        strategy: depend
        \ No newline at end of file
        ......@@ -14,42 +14,42 @@ digraph CentOS_dev {
        ranksep=2;
        "dev-el6-gcc44"
        "dev-el6-gcc73"
        "dev-el6-gcc83"
        "dev-el6-gcc91"
        "dev-el6-gcc7"
        "dev-el6-gcc8"
        "dev-el6-gcc9"
        "dev-el6-gcc44-x86"
        "dev-el6-gcc73-x86"
        "dev-el6-gcc83-x86"
        "dev-el6-gcc91-x86"
        "dev-el6-gcc7-x86"
        "dev-el6-gcc8-x86"
        "dev-el6-gcc9-x86"
        "dev-el7-gcc48"
        "dev-el7-gcc73"
        "dev-el7-gcc83"
        "dev-el7-gcc93"
        "dev-el7-gcc7"
        "dev-el7-gcc8"
        "dev-el7-gcc9"
        "dev-el7-gcc48-x86"
        "dev-el7-gcc73-x86"
        "dev-el7-gcc82-x86"
        "dev-el7-gcc93-x86"
        "dev-el7-gcc7-x86"
        "dev-el7-gcc8-x86"
        "dev-el7-gcc9-x86"
        # Extends
        edge [dir=back arrowtail=empty]
        "dev-el6-gcc44" -> "dev-el6-gcc73"
        "dev-el6-gcc44" -> "dev-el6-gcc83"
        "dev-el6-gcc44" -> "dev-el6-gcc91"
        "dev-el6-gcc44" -> "dev-el6-gcc7"
        "dev-el6-gcc44" -> "dev-el6-gcc8"
        "dev-el6-gcc44" -> "dev-el6-gcc9"
        "dev-el6-gcc44-x86" -> "dev-el6-gcc73-x86"
        "dev-el6-gcc44-x86" -> "dev-el6-gcc83-x86"
        "dev-el6-gcc44-x86" -> "dev-el6-gcc91-x86"
        "dev-el6-gcc44-x86" -> "dev-el6-gcc7-x86"
        "dev-el6-gcc44-x86" -> "dev-el6-gcc8-x86"
        "dev-el6-gcc44-x86" -> "dev-el6-gcc9-x86"
        "dev-el7-gcc48" -> "dev-el7-gcc73"
        "dev-el7-gcc48" -> "dev-el7-gcc83"
        "dev-el7-gcc48" -> "dev-el7-gcc93"
        "dev-el7-gcc48" -> "dev-el7-gcc7"
        "dev-el7-gcc48" -> "dev-el7-gcc8"
        "dev-el7-gcc48" -> "dev-el7-gcc9"
        "dev-el7-gcc48-x86" -> "dev-el7-gcc73-x86"
        "dev-el7-gcc48-x86" -> "dev-el7-gcc82-x86"
        "dev-el7-gcc48-x86" -> "dev-el7-gcc93-x86"
        "dev-el7-gcc48-x86" -> "dev-el7-gcc7-x86"
        "dev-el7-gcc48-x86" -> "dev-el7-gcc8-x86"
        "dev-el7-gcc48-x86" -> "dev-el7-gcc9-x86"
        }
        image: docker:latest
        services:
        - docker:dind
        .buildah-template:
        image: quay.io/containers/buildah:latest
        before_script:
        - echo "${CI_REGISTRY_PASSWORD}" | buildah login -u "${CI_REGISTRY_USER}" --password-stdin "${CI_REGISTRY}"
        variables:
        NAME: dev-el6-gcc44-x86
        ......@@ -12,57 +13,57 @@ stages:
        - test
        - release
        - triggers
        before_script:
        - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
        build:
        extends: .buildah-template
        stage: build
        script:
        - docker build --pull -t ${CONTAINER_TEST_IMAGE} --platform=linux/386 -f ${NAME}/Dockerfile .
        - docker push ${CONTAINER_TEST_IMAGE}
        - buildah build --pull -t ${CONTAINER_TEST_IMAGE} --platform=linux/386 -f ${NAME}/Dockerfile .
        - buildah push ${CONTAINER_TEST_IMAGE}
        test:
        image:
        name: ${CONTAINER_TEST_IMAGE}
        stage: test
        script:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
        - cat /etc/centos-release | grep "CentOS release 6"
        - gcc --version | grep "gcc (.*) 4\.4"
        - uname -m | grep "i686"
        release:
        extends: .buildah-template
        stage: release
        script:
        - docker pull ${CONTAINER_TEST_IMAGE}
        - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
        - docker push ${CONTAINER_RELEASE_IMAGE}
        - buildah pull ${CONTAINER_TEST_IMAGE}
        - buildah tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
        - buildah push ${CONTAINER_RELEASE_IMAGE}
        dev-el6-gcc73-x86:
        dev-el6-gcc7-x86:
        stage: triggers
        trigger:
        include: dev-el6-gcc73-x86/.gitlab-ci.yml
        include: dev-el6-gcc7-x86/.gitlab-ci.yml
        strategy: depend
        variables:
        NAME: dev-el6-gcc73-x86
        NAME: dev-el6-gcc7-x86
        CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
        CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
        dev-el6-gcc83-x86:
        dev-el6-gcc8-x86:
        stage: triggers
        trigger:
        include: dev-el6-gcc83-x86/.gitlab-ci.yml
        include: dev-el6-gcc8-x86/.gitlab-ci.yml
        strategy: depend
        variables:
        NAME: dev-el6-gcc83-x86
        NAME: dev-el6-gcc8-x86
        CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
        CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
        dev-el6-gcc91-x86:
        dev-el6-gcc9-x86:
        stage: triggers
        trigger:
        include: dev-el6-gcc91-x86/.gitlab-ci.yml
        include: dev-el6-gcc9-x86/.gitlab-ci.yml
        strategy: depend
        variables:
        NAME: dev-el6-gcc91-x86
        NAME: dev-el6-gcc9-x86
        CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
        CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
        FROM i386/centos:6
        FROM docker.io/i386/centos:6
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ......
        image: docker:latest
        services:
        - docker:dind
        .buildah-template:
        image: quay.io/containers/buildah:latest
        before_script:
        - echo "${CI_REGISTRY_PASSWORD}" | buildah login -u "${CI_REGISTRY_USER}" --password-stdin "${CI_REGISTRY}"
        variables:
        NAME: dev-el6-gcc44
        ......@@ -13,55 +14,56 @@ stages:
        - release
        - triggers
        before_script:
        - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
        build:
        extends: .buildah-template
        stage: build
        script:
        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
        - docker push ${CONTAINER_TEST_IMAGE}
        - buildah build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
        - buildah push ${CONTAINER_TEST_IMAGE}
        test:
        image:
        name: ${CONTAINER_TEST_IMAGE}
        stage: test
        script:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4"
        - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
        - cat /etc/centos-release | grep "CentOS release 6"
        - gcc --version | grep "gcc (.*) 4\.4"
        - uname -m | grep "x86_64"
        release:
        extends: .buildah-template
        stage: release
        script:
        - docker pull ${CONTAINER_TEST_IMAGE}
        - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
        - docker push ${CONTAINER_RELEASE_IMAGE}
        - buildah pull ${CONTAINER_TEST_IMAGE}
        - buildah tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
        - buildah push ${CONTAINER_RELEASE_IMAGE}
        dev-el6-gcc73:
        dev-el6-gcc7:
        stage: triggers
        trigger:
        include: dev-el6-gcc73/.gitlab-ci.yml
        include: dev-el6-gcc7/.gitlab-ci.yml
        strategy: depend
        variables:
        NAME: dev-el6-gcc73
        NAME: dev-el6-gcc7
        CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
        CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
        dev-el6-gcc83:
        dev-el6-gcc8:
        stage: triggers
        trigger:
        include: dev-el6-gcc83/.gitlab-ci.yml
        include: dev-el6-gcc8/.gitlab-ci.yml
        strategy: depend
        variables:
        NAME: dev-el6-gcc83
        NAME: dev-el6-gcc8
        CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
        CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
        dev-el6-gcc91:
        dev-el6-gcc9:
        stage: triggers
        trigger:
        include: dev-el6-gcc91/.gitlab-ci.yml
        include: dev-el6-gcc9/.gitlab-ci.yml
        strategy: depend
        variables:
        NAME: dev-el6-gcc91
        NAME: dev-el6-gcc9
        CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
        CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
        .buildah-template:
        image: quay.io/containers/buildah:latest
        before_script:
        - echo "${CI_REGISTRY_PASSWORD}" | buildah login -u "${CI_REGISTRY_USER}" --password-stdin "${CI_REGISTRY}"
        variables:
        NAME: dev-el6-gcc44-x86
        CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
        CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
        stages:
        - build
        - test
        - release
        build:
        extends: .buildah-template
        stage: build
        script:
        - buildah build --pull -t ${CONTAINER_TEST_IMAGE} --platform=linux/386 -f ${NAME}/Dockerfile .
        - buildah push ${CONTAINER_TEST_IMAGE}
        test:
        image:
        name: ${CONTAINER_TEST_IMAGE}
        docker:
        platform: linux/386
        stage: test
        script:
        - cat /etc/centos-release | grep "CentOS release 6"
        - gcc --version | grep "gcc (.*) 7\."
        - uname -m | grep "i686"
        release:
        extends: .buildah-template
        stage: release
        script:
        - buildah pull ${CONTAINER_TEST_IMAGE}
        - buildah tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
        - buildah push ${CONTAINER_RELEASE_IMAGE}
        File moved
        version: "3.8"
        services:
        dev-el6-gcc73-x86:
        dev-el6-gcc7-x86:
        build:
        context: .
        args:
        - http_proxy
        - https_proxy
        - no_proxy
        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc73-x86"
        container_name: dev-el6-gcc73-x86
        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc7-x86"
        container_name: dev-el6-gcc7-x86
        platform: "linux/386"
        tty: true
        environment:
        ......
        .buildah-template:
        image: quay.io/containers/buildah:latest
        before_script:
        - echo "${CI_REGISTRY_PASSWORD}" | buildah login -u "${CI_REGISTRY_USER}" --password-stdin "${CI_REGISTRY}"
        variables:
        NAME: dev-el6-gcc7
        CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
        CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
        stages:
        - build
        - test
        - release
        build:
        extends: .buildah-template
        stage: build
        script:
        - buildah build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
        - buildah push ${CONTAINER_TEST_IMAGE}
        test:
        image:
        name: ${CONTAINER_TEST_IMAGE}
        stage: test
        script:
        - cat /etc/centos-release | grep "CentOS release 6"
        - uname -m | grep "x86_64"
        - gcc --version | grep "gcc (.*) 7\."
        release:
        extends: .buildah-template
        stage: release
        script:
        - buildah pull ${CONTAINER_TEST_IMAGE}
        - buildah tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
        - buildah push ${CONTAINER_RELEASE_IMAGE}
        File moved
        version: "3.8"
        services:
        dev-el7-gcc112:
        dev-el6-gcc7-x86:
        build:
        context: .
        args:
        - http_proxy
        - https_proxy
        - no_proxy
        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc112"
        container_name: dev-el7-gcc112
        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc7-x86"
        container_name: dev-el6-gcc7-x86
        tty: true
        environment:
        - http_proxy
        ......
        image: docker:latest
        services:
        - docker:dind
        variables:
        NAME: dev-el6-gcc44-x86
        CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
        CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
        stages:
        - build
        - test
        - release
        before_script:
        - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
        build:
        stage: build
        script:
        - docker build --pull -t ${CONTAINER_TEST_IMAGE} --platform=linux/386 -f ${NAME}/Dockerfile .
        - docker push ${CONTAINER_TEST_IMAGE}
        test:
        stage: test
        script:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686"
        release:
        stage: release
        script:
        - docker pull ${CONTAINER_TEST_IMAGE}
        - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
        - docker push ${CONTAINER_RELEASE_IMAGE}
        image: docker:latest
        services:
        - docker:dind
        variables:
        NAME: dev-el6-gcc73
        CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
        CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
        stages:
        - build
        - test
        - release
        before_script:
        - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
        build:
        stage: build
        script:
        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
        - docker push ${CONTAINER_TEST_IMAGE}
        test:
        stage: test
        script:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6"
        - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64"
        - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3"
        release:
        stage: release
        script:
        - docker pull ${CONTAINER_TEST_IMAGE}
        - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
        - docker push ${CONTAINER_RELEASE_IMAGE}
        version: "3.8"
        services:
        dev-el6-gcc73-x86:
        build:
        context: .
        args:
        - http_proxy
        - https_proxy
        - no_proxy
        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73-x86"
        container_name: dev-el6-gcc73-x86
        tty: true
        environment:
        - http_proxy
        - https_proxy
        - no_proxy
        .buildah-template:
        image: quay.io/containers/buildah:latest
        before_script:
        - echo "${CI_REGISTRY_PASSWORD}" | buildah login -u "${CI_REGISTRY_USER}" --password-stdin "${CI_REGISTRY}"
        variables:
        NAME: dev-el6-gcc8-x86
        CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
        CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
        stages:
        - build
        - test
        - release
        build:
        extends: .buildah-template
        stage: build
        script:
        - buildah build --pull -t ${CONTAINER_TEST_IMAGE} --platform=linux/386 -f ${NAME}/Dockerfile .
        - buildah push ${CONTAINER_TEST_IMAGE}
        test:
        image:
        name: ${CONTAINER_TEST_IMAGE}
        stage: test
        script:
        - cat /etc/centos-release | grep "CentOS release 6"
        - uname -m | grep "i686"
        - gcc --version | grep "gcc (.*) 8\."
        release:
        extends: .buildah-template
        stage: release
        script:
        - buildah pull ${CONTAINER_TEST_IMAGE}
        - buildah tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
        - buildah push ${CONTAINER_RELEASE_IMAGE}
        File moved
        version: "3.8"
        services:
        dev-el6-gcc83-x86:
        dev-el6-gcc8-x86:
        build:
        context: .
        args:
        - http_proxy
        - https_proxy
        - no_proxy
        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc83-x86"
        container_name: dev-el6-gcc83-x86
        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc8-x86"
        container_name: dev-el6-gcc8-x86
        platform: "linux/386"
        tty: true
        environment:
        ......
        .buildah-template:
        image: quay.io/containers/buildah:latest
        before_script:
        - echo "${CI_REGISTRY_PASSWORD}" | buildah login -u "${CI_REGISTRY_USER}" --password-stdin "${CI_REGISTRY}"
        variables:
        NAME: dev-el6-gcc8
        CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG
        CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest
        stages:
        - build
        - test
        - release
        build:
        extends: .buildah-template
        stage: build
        script:
        - buildah build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile .
        - buildah push ${CONTAINER_TEST_IMAGE}
        test:
        image:
        name: ${CONTAINER_TEST_IMAGE}
        stage: test
        script:
        - cat /etc/centos-release | grep "CentOS release 6"
        - uname -m | grep "x86_64"
        - gcc --version | grep "gcc (.*) 8\."
        release:
        extends: .buildah-template
        stage: release
        script:
        - buildah pull ${CONTAINER_TEST_IMAGE}
        - buildah tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE}
        - buildah push ${CONTAINER_RELEASE_IMAGE}
        File moved
        version: "3.8"
        services:
        dev-el6-gcc91:
        dev-el6-gcc8:
        build:
        context: .
        args:
        - http_proxy
        - https_proxy
        - no_proxy
        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc91"
        container_name: dev-el6-gcc91
        image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc8"
        container_name: dev-el6-gcc8
        tty: true
        environment:
        - http_proxy
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment