From a153eb831f53a855ecc7c7d32beda22226b8a827 Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Mon, 24 Jun 2024 21:47:12 +0200 Subject: [PATCH] Add Rocky 9 GCC 11 --- .gitlab-ci.yml | 5 +++ conan-el9-gcc114/.gitlab-ci.yml | 42 ++++++++++++++++++++ conan-el9-gcc114/Dockerfile | 61 +++++++++++++++++++++++++++++ conan-el9-gcc114/docker-compose.yml | 18 +++++++++ 4 files changed, 126 insertions(+) create mode 100644 conan-el9-gcc114/.gitlab-ci.yml create mode 100644 conan-el9-gcc114/Dockerfile create mode 100644 conan-el9-gcc114/docker-compose.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2fc21fd..e0be1bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,3 +103,8 @@ conan-el7-gcc93-x86: include: conan-el7-gcc93-x86/.gitlab-ci.yml strategy: depend +conan-el9-gcc114: + stage: triggers + trigger: + include: conan-el9-gcc114/.gitlab-ci.yml + strategy: depend \ No newline at end of file diff --git a/conan-el9-gcc114/.gitlab-ci.yml b/conan-el9-gcc114/.gitlab-ci.yml new file mode 100644 index 0000000..7e5d600 --- /dev/null +++ b/conan-el9-gcc114/.gitlab-ci.yml @@ -0,0 +1,42 @@ +image: docker:latest +services: + - docker:dind + +variables: + NAME: conan-el9-gcc114 + 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/rocky-release | grep "Rocky Linux release 9" + - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" + - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 11\.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" + - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" + - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" + - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version + - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version + +release: + stage: release + script: + - docker pull ${CONTAINER_TEST_IMAGE} + - docker tag ${CONTAINER_TEST_IMAGE} ${CONTAINER_RELEASE_IMAGE} + - docker push ${CONTAINER_RELEASE_IMAGE} diff --git a/conan-el9-gcc114/Dockerfile b/conan-el9-gcc114/Dockerfile new file mode 100644 index 0000000..ca4e5ad --- /dev/null +++ b/conan-el9-gcc114/Dockerfile @@ -0,0 +1,61 @@ +FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el9-gcc114 + +LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" + +ARG PYTHON_VERSION=3.6.13 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ + GIT_VERSION=2.39.2 \ + DEVTOOLS_ROOT=/usr/Local/devtools \ + OS=linux \ + ARCH=x86_64 + +ENV PYTHON_ROOT=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH} \ + CONAN_ROOT=${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH} \ + CMAKE_ROOT=${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH} \ + GIT_ROOT=${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH} \ + PATH=${DEVTOOLS_ROOT}/bin:${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/conan-${CONAN_VERSION}-${OS}-${ARCH}:${DEVTOOLS_ROOT}/cmake-${CMAKE_VERSION}-${OS}-${ARCH}/bin:${DEVTOOLS_ROOT}/git-${GIT_VERSION}-${OS}-${ARCH}/bin:${PATH} \ + LD_LIBRARY_PATH=${DEVTOOLS_ROOT}/python-${PYTHON_VERSION}-${OS}-${ARCH}/lib \ + CXX=/usr/bin/g++ \ + CC=/usr/bin/gcc + +RUN groupadd g1001 -g 1001 \ + && groupadd g1000 -g 1000 \ + && groupadd g2000 -g 2000 \ + # Creation of conan user + && useradd -ms /bin/bash conan -u 1000 -g 1001 -G 1000,2000,999 \ + # Add sudo for conan user + && printf "conan:conan" | chpasswd \ + && printf "conan ALL= NOPASSWD: ALL\\n" >> /etc/sudoers \ + # Create devtools folder + && mkdir -p ${DEVTOOLS_ROOT} \ + # Install python 3 + && curl -s -L -o ${PYTHON_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/3.6.13/download?job=linux-x86_64 \ + && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ + && rm ${PYTHON_ROOT}.zip \ + # Install git + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ + && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ + && rm ${GIT_ROOT}.zip \ + # Install cmake + && CMAKE_VERSION_MAJOR_MINOR=$(echo ${CMAKE_VERSION} | sed 's/^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)$/\1\.\2/') \ + && curl -s https://cmake.org/files/v${CMAKE_VERSION_MAJOR_MINOR}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz | tar -xzf - -C ${DEVTOOLS_ROOT} \ + --exclude=bin/cmake-gui \ + --exclude=doc/cmake \ + --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \ + --exclude=share/vim \ + # Install conan + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-x86_64 \ + && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ + && rm ${CONAN_ROOT}.zip \ + # Install other tools + && mkdir ${DEVTOOLS_ROOT}/bin \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 \ + && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ + && chmod +x ${DEVTOOLS_ROOT}/bin/* + +COPY environment /etc/environment +USER conan +WORKDIR /home/conan + +RUN mkdir -p /home/conan/.conan diff --git a/conan-el9-gcc114/docker-compose.yml b/conan-el9-gcc114/docker-compose.yml new file mode 100644 index 0000000..5a0d63b --- /dev/null +++ b/conan-el9-gcc114/docker-compose.yml @@ -0,0 +1,18 @@ +version: "3.8" + +services: + conan-el9-gcc114: + build: + context: .. + dockerfile: conan-el9-gcc114/Dockerfile + args: + - http_proxy + - https_proxy + - no_proxy + image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el9-gcc114" + container_name: conan-el9-gcc114 + tty: true + environment: + - http_proxy + - https_proxy + - no_proxy -- GitLab