diff --git a/.github/actions/package-sign/action.yml b/.github/actions/package-sign/action.yml index 3d197b0edd2..bdfb32c77a7 100644 --- a/.github/actions/package-sign/action.yml +++ b/.github/actions/package-sign/action.yml @@ -13,11 +13,14 @@ inputs: centreon_pat: description: "Secret" required: false - username: - description: The artifactory username + registry_url: + description: Docker registry url required: true - password: - description: The artifactory password + registry_username: + description: Docker registry username + required: true + registry_password: + description: Docker registry password required: true params: description: "params for script" @@ -28,9 +31,9 @@ runs: - name: Login to Registry uses: docker/login-action@v2 with: - registry: docker.centreon.com - username: ${{ inputs.username }} - password: ${{ inputs.password }} + registry: ${{ inputs.registry_url }} + username: ${{ inputs.registry_username }} + password: ${{ inputs.registry_password }} - - run: docker run -i -e TOKEN=${{ inputs.centreon_pat }} --entrypoint /src/.github/scripts/${{ inputs.script_name }}.sh -v "$PWD:/src" docker.centreon.com/${{ inputs.image_name }}:${{ inputs.image_version}} ${{ inputs.params }} + - run: docker run -i -e TOKEN=${{ inputs.centreon_pat }} --entrypoint /src/.github/scripts/${{ inputs.script_name }}.sh -v "$PWD:/src" ${{ inputs.registry_url }}/${{ inputs.image_name }}:${{ inputs.image_version}} ${{ inputs.params }} shell: bash \ No newline at end of file diff --git a/.github/actions/runner-docker/action.yml b/.github/actions/runner-docker/action.yml index 90d8e50249d..8f943b43544 100644 --- a/.github/actions/runner-docker/action.yml +++ b/.github/actions/runner-docker/action.yml @@ -1,6 +1,9 @@ name: "runner docker Centreon" description: "runner docker Centreon" inputs: + registry_url: + description: Docker registry url + required: true script_name: description: "script name" required: true @@ -17,11 +20,8 @@ inputs: description: "params for script" required: false -env: - REGISTRY: docker.centreon.com - runs: using: "composite" steps: - - run: docker run -i --entrypoint ${{ inputs.script_name }}.sh -v "$PWD:/src" ${{ inputs.env_variable }} ${{ env.REGISTRY }}/${{ inputs.image_name }}:${{ inputs.image_version}} ${{ inputs.params }} + - run: docker run -i --entrypoint ${{ inputs.script_name }}.sh -v "$PWD:/src" ${{ inputs.env_variable }} ${{ inputs.registry_url }}/${{ inputs.image_name }}:${{ inputs.image_version}} ${{ inputs.params }} shell: bash diff --git a/.github/workflows/centreon-collect.yml b/.github/workflows/centreon-collect.yml index 2206a040098..10bf48bdfbe 100644 --- a/.github/workflows/centreon-collect.yml +++ b/.github/workflows/centreon-collect.yml @@ -5,11 +5,10 @@ on: pull_request: push: branches: - - dev-22.04.x - -env: - REGISTRY: docker.centreon.com - + - develop + - dev-[2-9][0-9].[0-9][0-9].x + - master + - "[2-9][0-9].[0-9][0-9].x" jobs: create-version: @@ -62,22 +61,24 @@ jobs: strategy: matrix: - include: - - image: centos7 - - image: alma8 - - image: debian-bullseye + image: [centos7, alma8, debian-bullseye] + name: unit test ${{ matrix.image }} + steps: - name: Checkout sources uses: actions/checkout@v3 + - name: Login to Registry uses: docker/login-action@v2 with: - registry: ${{ env.REGISTRY }} - username: ${{ secrets.REPOS_USERNAME }} - password: ${{ secrets.REPOS_PASSWORD }} + registry: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }} + username: ${{ secrets.DOCKER_REGISTRY_ID }} + password: ${{ secrets.DOCKER_REGISTRY_PASSWD }} + - name: Test ${{ matrix.image }} uses: ./.github/actions/runner-docker with: + registry_url: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }} script_name: /src/ci/scripts/collect-unit-tests image_name: centreon-collect-${{ matrix.image }} image_version: ${{ env.imgversion }} @@ -100,16 +101,18 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v3 + - name: Login to Registry uses: docker/login-action@v2 with: - registry: ${{ env.REGISTRY }} - username: ${{ secrets.REPOS_USERNAME }} - password: ${{ secrets.REPOS_PASSWORD }} + registry: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }} + username: ${{ secrets.DOCKER_REGISTRY_ID }} + password: ${{ secrets.DOCKER_REGISTRY_PASSWD }} - name: make rpm ${{ matrix.image }} uses: ./.github/actions/runner-docker with: + registry_url: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }} script_name: /src/ci/scripts/collect-rpm-package image_name: centreon-collect-${{ matrix.image }} image_version: ${{ env.imgversion }} @@ -121,8 +124,9 @@ jobs: script_name: rpm-signing image_name: rpm-signing image_version: ubuntu - username: ${{ secrets.REPOS_USERNAME }} - password: ${{ secrets.REPOS_PASSWORD }} + registry_url: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }} + registry_username: ${{ secrets.DOCKER_REGISTRY_ID }} + registry_password: ${{ secrets.DOCKER_REGISTRY_PASSWD }} - name: Use cache RPM files uses: actions/cache@v3 @@ -165,13 +169,14 @@ jobs: - name: Login to Registry uses: docker/login-action@v2 with: - registry: ${{ env.REGISTRY }} - username: ${{ secrets.REPOS_USERNAME }} - password: ${{ secrets.REPOS_PASSWORD }} + registry: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }} + username: ${{ secrets.DOCKER_REGISTRY_ID }} + password: ${{ secrets.DOCKER_REGISTRY_PASSWD }} - name: debmake ${{ matrix.image }} uses: ./centreon-collect/.github/actions/runner-docker with: + registry_url: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }} script_name: /src/centreon-collect/ci/scripts/collect-deb-package image_name: centreon-collect-${{ matrix.image }} image_version: ${{ env.imgversion }} diff --git a/.github/workflows/docker-builder.yml b/.github/workflows/docker-builder.yml index ba1938685c0..39fcfdf156b 100644 --- a/.github/workflows/docker-builder.yml +++ b/.github/workflows/docker-builder.yml @@ -1,11 +1,10 @@ name: Centreon collect build docker on: - pull_request_target: - types: - - closed + push: branches: - develop + - dev-[2-9][0-9].[0-9][0-9].x paths: - 'ci/docker/**' workflow_dispatch: @@ -13,9 +12,6 @@ on: paths: - 'ci/docker/**' -env: - REGISTRY: docker.centreon.com - jobs: create-version: runs-on: ubuntu-latest @@ -43,13 +39,10 @@ jobs: strategy: fail-fast: false matrix: + distrib: [centos7, alma8, debian-bullseye] include: - project: collect - distrib: centos7 - - project: collect - distrib: alma8 - - project: collect - distrib: debian-bullseye + steps: - name: Checkout sources uses: actions/checkout@v3 @@ -57,13 +50,17 @@ jobs: - name: Login to Registry uses: docker/login-action@v2 with: - registry: ${{ env.REGISTRY }} - username: ${{ secrets.REPOS_USERNAME }} - password: ${{ secrets.REPOS_PASSWORD }} - - - name: build docker ${{ matrix.distrib }} - run: docker build --no-cache . -f ci/docker/Dockerfile.${{ matrix.project }}-${{ matrix.distrib }} -t $REGISTRY/centreon-${{ matrix.project }}-${{ matrix.distrib }}:${{ env.imgversion }} + registry: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }} + username: ${{ secrets.DOCKER_REGISTRY_ID }} + password: ${{ secrets.DOCKER_REGISTRY_PASSWD }} - - name: push docker ${{ matrix.distrib }} - run: docker push $REGISTRY/centreon-${{ matrix.project }}-${{ matrix.distrib }}:${{ env.imgversion }} + - uses: docker/setup-buildx-action@v2 + - uses: docker/build-push-action@v3 + with: + file: ci/docker/Dockerfile.${{ matrix.project }}-${{ matrix.distrib }} + context: . + build-args: "REGISTRY_URL=${{ vars.DOCKER_PROXY_REGISTRY_URL }}" + pull: true + push: true + tags: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/centreon-${{ matrix.project }}-${{ matrix.distrib }}:${{ env.imgversion }} diff --git a/.github/workflows/robot-nightly.yml b/.github/workflows/robot-nightly.yml index eedf61f4b5c..62b7480aa73 100644 --- a/.github/workflows/robot-nightly.yml +++ b/.github/workflows/robot-nightly.yml @@ -8,9 +8,6 @@ on: schedule: - cron: '0 0 * * *' -env: - REGISTRY: docker.centreon.com - jobs: robot-test: runs-on: [self-hosted, collect] @@ -63,13 +60,14 @@ jobs: - name: Login to Registry uses: docker/login-action@v2 with: - registry: ${{ env.REGISTRY }} - username: ${{ secrets.REPOS_USERNAME }} - password: ${{ secrets.REPOS_PASSWORD }} + registry: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }} + username: ${{ secrets.DOCKER_REGISTRY_ID }} + password: ${{ secrets.DOCKER_REGISTRY_PASSWD }} - name: Tests robot (Centos7, Alma8) uses: ./.github/actions/runner-docker with: + registry_url: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }} script_name: /src/ci/scripts/collect-test-robot image_name: ${{ matrix.image }} image_version: ${{ env.imgversion }} diff --git a/README.md b/README.md index 5751ed69559..b96bbb21aac 100644 --- a/README.md +++ b/README.md @@ -153,7 +153,7 @@ apt install conan If it does not work, conan can be installed with pip3: ```shell -pip3 install conan +pip3 install conan==1.57.0 ``` > All the dependencies pulled by conan are located in conanfile.txt. If diff --git a/ci/debian-gorgone/centreon-gorgone.dirs b/ci/debian-gorgone/centreon-gorgone.dirs deleted file mode 100644 index 326d08ce2ea..00000000000 --- a/ci/debian-gorgone/centreon-gorgone.dirs +++ /dev/null @@ -1,6 +0,0 @@ -etc/centreon-gorgone/config.d -etc/centreon-gorgone/config.d/cron.d -var/cache/centreon-gorgone -var/cache/centreon-gorgone/autodiscovery -var/lib/centreon-gorgone -var/log/centreon-gorgone diff --git a/ci/debian-gorgone/centreon-gorgone.install b/ci/debian-gorgone/centreon-gorgone.install deleted file mode 100644 index 664fd3010ed..00000000000 --- a/ci/debian-gorgone/centreon-gorgone.install +++ /dev/null @@ -1,12 +0,0 @@ -gorgoned usr/bin -contrib/* usr/local/bin -packaging/config.yaml etc/centreon-gorgone -packaging/centreon.yaml etc/centreon-gorgone/config.d -packaging/centreon-api.yaml etc/centreon-gorgone/config.d -packaging/centreon-audit.yaml etc/centreon-gorgone/config.d -packaging/sudoers.d/centreon-gorgone etc/sudoers.d -debian/extra/gorgoned.service lib/systemd/system -debian/extra/gorgoned etc/default -gorgone/class/* usr/share/perl5/gorgone/class -gorgone/modules/* usr/share/perl5/gorgone/modules -gorgone/standard/* usr/share/perl5/gorgone/standard diff --git a/ci/debian-gorgone/centreon-gorgone.logrotate b/ci/debian-gorgone/centreon-gorgone.logrotate deleted file mode 100644 index e6f56b7475f..00000000000 --- a/ci/debian-gorgone/centreon-gorgone.logrotate +++ /dev/null @@ -1,10 +0,0 @@ -/var/log/centreon-gorgone/gorgoned.log { - copytruncate - weekly - rotate 52 - compress - delaycompress - notifempty - missingok - su root root -} diff --git a/ci/debian-gorgone/centreon-gorgone.postinst b/ci/debian-gorgone/centreon-gorgone.postinst deleted file mode 100644 index 69e8fd4bc53..00000000000 --- a/ci/debian-gorgone/centreon-gorgone.postinst +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh - -if [ "$1" = "configure" ] ; then - - if [ ! "$(getent passwd centreon-gorgone)" ]; then - adduser --system --group --home /var/lib/centreon-gorgone --no-create-home centreon-gorgone - fi - - if [ "$(getent passwd centreon)" ]; then - usermod -a -G centreon-gorgone centreon - usermod -a -G centreon centreon-gorgone - fi - - if [ "$(getent passwd centreon-engine)" ]; then - usermod -a -G centreon-gorgone centreon-engine - fi - - if [ "$(getent passwd centreon-broker)" ]; then - usermod -a -G centreon-gorgone centreon-broker - fi - - chown -vR centreon-gorgone:centreon-gorgone \ - /etc/centreon-gorgone \ - /var/cache/centreon-gorgone \ - /var/cache/centreon-gorgone/autodiscovery \ - /var/lib/centreon-gorgone \ - /var/log/centreon-gorgone - chmod -vR g+w \ - /etc/centreon-gorgone \ - /var/cache/centreon-gorgone \ - /var/cache/centreon-gorgone/autodiscovery \ - /var/lib/centreon-gorgone \ - /var/log/centreon-gorgone - - chown root:root \ - /usr/local/bin/gorgone_config_init.pl \ - /usr/local/bin/gorgone_audit.pl \ - /usr/local/bin/gorgone_install_plugins.pl - - chmod 0755 \ - /usr/local/bin/gorgone_config_init.pl \ - /usr/local/bin/gorgone_audit.pl - - chmod 0750 \ - /usr/local/bin/gorgone_install_plugins.pl - - if [ ! -d /var/lib/centreon-gorgone/.ssh -a -d /var/spool/centreon/.ssh ] ; then - /usr/bin/cp -r /var/spool/centreon/.ssh /var/lib/centreon-gorgone/.ssh - /usr/bin/chown -R centreon-gorgone:centreon-gorgone /var/lib/centreon-gorgone/.ssh - /usr/bin/chmod 600 /var/lib/centreon-gorgone/.ssh/id_rsa - fi - - # rename files to priority - if [ ! -e /etc/centreon-gorgone/config.d/30-centreon.yaml ] && [ -e /etc/centreon-gorgone/config.d/centreon.yaml ]; then - mv /etc/centreon-gorgone/config.d/centreon.yaml /etc/centreon-gorgone/config.d/30-centreon.yaml - fi - if [ ! -e /etc/centreon-gorgone/config.d/31-centreon-api.yaml ] && [ -e /etc/centreon-gorgone/config.d/centreon-api.yaml ]; then - mv /etc/centreon-gorgone/config.d/centreon-api.yaml /etc/centreon-gorgone/config.d/31-centreon-api.yaml - fi - if [ ! -e /etc/centreon-gorgone/config.d/50-centreon-audit.yaml ] && [ -e /etc/centreon-gorgone/config.d/centreon-audit.yaml ]; then - mv /etc/centreon-gorgone/config.d/centreon-audit.yaml /etc/centreon-gorgone/config.d/50-centreon-audit.yaml - fi - - systemctl preset gorgoned.service || : >/dev/null 2>&1 || : - -fi -exit 0 diff --git a/ci/debian-gorgone/extra/gorgoned b/ci/debian-gorgone/extra/gorgoned deleted file mode 100644 index d6fb7a6ebe2..00000000000 --- a/ci/debian-gorgone/extra/gorgoned +++ /dev/null @@ -1,6 +0,0 @@ -# Configuration file for Centreon Gorgone. - -# OPTIONS for the daemon launch -CONFIG="/etc/centreon-gorgone/config.yaml" -LOGFILE="/var/log/centreon-gorgone/gorgoned.log" -SEVERITY="info" diff --git a/ci/debian-gorgone/extra/gorgoned.service b/ci/debian-gorgone/extra/gorgoned.service deleted file mode 100644 index a226b0256c4..00000000000 --- a/ci/debian-gorgone/extra/gorgoned.service +++ /dev/null @@ -1,33 +0,0 @@ -## -## Copyright 2019-2021 Centreon -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## -## For more information : contact@centreon.com -## - -[Unit] -Description=Centreon Gorgone -PartOf=centreon.service -After=centreon.service -ReloadPropagatedFrom=centreon.service - -[Service] -EnvironmentFile=/etc/default/gorgoned -ExecStart=/usr/bin/perl /usr/bin/gorgoned --config=${CONFIG} --logfile=${LOGFILE} --severity=${SEVERITY} -Type=simple -User=centreon-gorgone - -[Install] -WantedBy=multi-user.target -WantedBy=centreon.service diff --git a/ci/debian-gorgone/rules b/ci/debian-gorgone/rules deleted file mode 100644 index 95af63e770c..00000000000 --- a/ci/debian-gorgone/rules +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/make -f - -export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -%: - dh $@ - -override_dh_gencontrol: - dh_gencontrol -- -Tdebian/substvars - -override_dh_usrlocal: diff --git a/ci/debian-gorgone/source/format b/ci/debian-gorgone/source/format deleted file mode 100644 index 163aaf8d82b..00000000000 --- a/ci/debian-gorgone/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/ci/debian-gorgone/substvars b/ci/debian-gorgone/substvars deleted file mode 100644 index 929c65b6607..00000000000 --- a/ci/debian-gorgone/substvars +++ /dev/null @@ -1 +0,0 @@ -centreon:version= diff --git a/ci/docker/Dockerfile.collect-alma8 b/ci/docker/Dockerfile.collect-alma8 index 73cc9ab8ea8..b5b91de789b 100644 --- a/ci/docker/Dockerfile.collect-alma8 +++ b/ci/docker/Dockerfile.collect-alma8 @@ -1,4 +1,6 @@ -FROM almalinux:8.5 +ARG REGISTRY_URL + +FROM ${REGISTRY_URL}/almalinux:8 RUN dnf clean all @@ -41,7 +43,7 @@ RUN dnf clean all && dnf install -y cmake \ rpm-build RUN dnf update libarchive -RUN pip3 install conan --prefix=/usr --upgrade +RUN pip3 install conan==1.57.0 --prefix=/usr --upgrade RUN rm -rf ~/.conan/profiles/default COPY conanfile.txt . RUN cat conanfile.txt diff --git a/ci/docker/Dockerfile.collect-centos7 b/ci/docker/Dockerfile.collect-centos7 index ea06641e271..a3b777c1a55 100644 --- a/ci/docker/Dockerfile.collect-centos7 +++ b/ci/docker/Dockerfile.collect-centos7 @@ -1,4 +1,7 @@ -FROM centos:7 +ARG REGISTRY_URL + +FROM ${REGISTRY_URL}/centos:7 + RUN curl https://downloads.mariadb.com/MariaDB/mariadb-10.5.8/yum/centos7-amd64/rpms/MariaDB-shared-10.5.8-1.el7.centos.x86_64.rpm --output MariaDB-shared-10.5.8-1.el7.centos.x86_64.rpm && \ curl https://downloads.mariadb.com/MariaDB/mariadb-10.5.8/yum/centos7-amd64/rpms/MariaDB-common-10.5.8-1.el7.centos.x86_64.rpm --output MariaDB-common-10.5.8-1.el7.centos.x86_64.rpm && \ curl https://downloads.mariadb.com/MariaDB/mariadb-10.5.8/yum/centos7-amd64/rpms/MariaDB-compat-10.5.8-1.el7.centos.x86_64.rpm --output MariaDB-compat-10.5.8-1.el7.centos.x86_64.rpm && \ @@ -46,7 +49,7 @@ RUN ln -s /usr/bin/cmake3 /usr/bin/cmake COPY conanfile.txt . RUN cat conanfile.txt RUN source /opt/rh/devtoolset-9/enable && source /opt/rh/rh-python38/enable && \ - pip3 install conan --upgrade &&\ + pip3 install conan==1.57.0 --upgrade &&\ /opt/rh/rh-python38/root/usr/local/bin/conan install . -s compiler.cppstd=14 -s compiler.libcxx=libstdc++11 --build='*' RUN unzip -q sonar-scanner-cli-4.7.0.2747-linux.zip diff --git a/ci/docker/Dockerfile.collect-debian-bullseye b/ci/docker/Dockerfile.collect-debian-bullseye index 6132883ee1d..ffa52a01640 100644 --- a/ci/docker/Dockerfile.collect-debian-bullseye +++ b/ci/docker/Dockerfile.collect-debian-bullseye @@ -1,4 +1,7 @@ -FROM debian:bullseye +ARG REGISTRY_URL + +FROM ${REGISTRY_URL}/debian:bullseye + RUN apt-get -y update && \ apt-get -y install cmake \ curl \ @@ -29,7 +32,7 @@ RUN apt-get -y update && \ localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py RUN python3 get-pip.py -RUN pip3 install conan +RUN pip3 install conan==1.57.0 RUN ln -s /usr/local/bin/conan /usr/bin/conan RUN rm -rf ~/.conan/profiles/default COPY conanfile.txt . diff --git a/ci/docker/Dockerfile.gorgone-alma8 b/ci/docker/Dockerfile.gorgone-alma8 deleted file mode 100644 index f3bd7f4352f..00000000000 --- a/ci/docker/Dockerfile.gorgone-alma8 +++ /dev/null @@ -1,21 +0,0 @@ -FROM almalinux:8.5 - -RUN dnf clean all -# fix locale -RUN echo 'http_caching=none' >> /etc/yum.conf && \ - echo 'assumeyes=1' >> /etc/yum.conf && \ - sed -i 's/best=True/best=False/g' /etc/dnf/dnf.conf && \ - dnf install -y dnf-plugins-core -RUN dnf config-manager --set-enabled powertools -RUN dnf clean all && dnf install -y perl-ExtUtils-Embed.noarch \ - python38 \ - python38-pip \ - perl-Thread-Queue \ - redhat-lsb \ - yum-utils \ - perl \ - rpm-build -RUN dnf update libarchive - - -WORKDIR /src diff --git a/ci/docker/Dockerfile.gorgone-centos7 b/ci/docker/Dockerfile.gorgone-centos7 deleted file mode 100644 index 721da1fc189..00000000000 --- a/ci/docker/Dockerfile.gorgone-centos7 +++ /dev/null @@ -1,23 +0,0 @@ -FROM centos:7 - -# fix locale -RUN yum -y upgrade && yum -y update && \ - yum -y install perl-Thread-Queue \ - perl-devel \ - perl-Data-Dumper \ - perl-ExtUtils-MakeMaker \ - perl-ExtUtils-Embed.noarch \ - redhat-lsb \ - rh-python38 \ - perl-Ext* \ - perl-App-FatPacker \ - perl-File-Copy-Recursive \ - perl-JSON \ - gettext \ - expect \ - perl-XML-SAX \ - rpm-build \ - unzip \ - ShellCheck - -WORKDIR /src diff --git a/ci/docker/Dockerfile.gorgone-debian-bullseye b/ci/docker/Dockerfile.gorgone-debian-bullseye deleted file mode 100644 index 587d3c37610..00000000000 --- a/ci/docker/Dockerfile.gorgone-debian-bullseye +++ /dev/null @@ -1,30 +0,0 @@ -FROM debian:bullseye - -# fix locale -RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \ -&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 -ENV LANG en_US.utf8 - -RUN apt-get update && apt-get install -y \ -dh-make \ -dh-make-perl \ -libtest-simple-perl \ -libmodule-install-perl \ -libnet-ldap-perl \ -libauthen-simple-passwd-perl \ -libmojolicious-perl \ -aptitude \ -lintian \ -pbuilder \ -quilt \ -git-buildpackage \ -debmake \ -devscripts \ -fakeroot \ -curl \ -python3 \ -python3-pip \ -&& pip3 install conan \ -&& ln -s /usr/local/bin/conan /usr/bin/conan - -WORKDIR /src diff --git a/ci/scripts/gorgone-deb-package.sh b/ci/scripts/gorgone-deb-package.sh deleted file mode 100755 index 27a27742e5b..00000000000 --- a/ci/scripts/gorgone-deb-package.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -set -ex - -if [ -z "$VERSION" -o -z "$RELEASE" -o -z "$DISTRIB" ] ; then - echo "You need to specify VERSION / RELEASE / DISTRIB variables" - exit 1 -fi - -echo "################################################## PACKAGING GORGONE ##################################################" - -AUTHOR="Luiz Costa" -AUTHOR_EMAIL="me@luizgustavo.pro.br" - -echo `pwd` - -if [ -d /build ]; then - rm -rf /build -fi -mkdir -p /build - -mkdir -p /build/tmp -cd /build/tmp -apt-cache dumpavail | dpkg --merge-avail - -yes | dh-make-perl make --build --version "0.11.3-${DISTRIB}" --cpan Mojolicious::Plugin::BasicAuthPlus -dpkg -i libmojolicious-plugin-basicauthplus-perl_0.11.3-${DISTRIB}_all.deb - -yes | dh-make-perl make --build --revision ${DISTRIB} --cpan ZMQ::Constants -dpkg -i libzmq-constants-perl_1.04-${DISTRIB}_all.deb - -git clone https://github.com/centreon-lab/zmq-libzmq4-perl.git zmq-libzmq4-perl-0.02 -mkdir zmq-libzmq4-perl -mv -v zmq-libzmq4-perl-0.02 zmq-libzmq4-perl/ -cd zmq-libzmq4-perl/ -tar czpvf zmq-libzmq4-perl-0.02.tar.gz zmq-libzmq4-perl-0.02 -cd zmq-libzmq4-perl-0.02 -rm -rf debian/changelog -debmake -f "${AUTHOR}" -e "${AUTHOR_EMAIL}" -b ":perl" -r ${DISTRIB} -y -debuild-pbuilder -uc -us -cd .. -dpkg -i zmq-libzmq4-perl_0.02-${DISTRIB}_all.deb -cd /build - -# fix version to debian format accept -VERSION="$(echo $VERSION | sed 's/-/./g')" - -mkdir -p /build/centreon-gorgone -mv /src/centreon-collect/gorgone /src/centreon-collect/centreon-gorgone -(cd /src/centreon-collect && tar czvpf - centreon-gorgone) | dd of=centreon-gorgone-$VERSION.tar.gz -cp -rv /src/centreon-collect/centreon-gorgone /build/ -cp -rv /src/centreon-collect/ci/debian-gorgone /build/centreon-gorgone/debian -sed -i "s/^centreon:version=.*$/centreon:version=$(echo $VERSION | egrep -o '^[0-9][0-9].[0-9][0-9]')/" /build/centreon-gorgone/debian/substvars - -cd /build/centreon-gorgone -debmake -f "${AUTHOR}" -e "${AUTHOR_EMAIL}" -u "$VERSION" -b ":perl" -y -r "${DISTRIB}" -debuild-pbuilder - -cd /build - -if [ -d "$DISTRIB" ] ; then - rm -rf "$DISTRIB" -fi -mkdir $DISTRIB -mv /build/tmp/libmojolicious-plugin-basicauthplus-perl_0.11.3-${DISTRIB}_all.deb $DISTRIB/ -mv /build/tmp/zmq-libzmq4-perl/zmq-libzmq4-perl_0.02-${DISTRIB}_all.deb $DISTRIB/ -mv /build/tmp/libzmq-constants-perl_1.04-${DISTRIB}_all.deb $DISTRIB/ -mv /build/*.deb $DISTRIB/ -mkdir /src/$DISTRIB -mv /build/$DISTRIB/*.deb /src/$DISTRIB diff --git a/ci/scripts/gorgone-rpm-package.sh b/ci/scripts/gorgone-rpm-package.sh deleted file mode 100755 index fd23c427b5f..00000000000 --- a/ci/scripts/gorgone-rpm-package.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -set -ex - -if [ -z "$VERSION" -o -z "$RELEASE" ] ; then - echo "You need to specify VERSION / RELEASE / DISTRIB variables" - exit 1 -fi - -echo "################################################## PACKAGING GORGONE ##################################################" - - -# generate rpm broker -if [ ! -d /root/rpmbuild/SOURCES ] ; then - mkdir -p /root/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} -fi -cd /src/gorgone - -tar czvpf /root/rpmbuild/SOURCES/centreon-gorgone-$VERSION.tar.gz \ - --transform "s,^\.,centreon-gorgone-$VERSION," . - -rpmbuild -ba /src/gorgone/packaging/centreon-gorgone.spectemplate -D "VERSION $VERSION" -D "REL $RELEASE" - -# cleaning and according permissions to slave to delivery rpms -cd /src -rm -rf *.rpm -cp -r /root/rpmbuild/RPMS/noarch/*.rpm . -chmod 777 *.rpm \ No newline at end of file diff --git a/cmake.sh b/cmake.sh index e082388e3ca..54bc3bf3ad5 100755 --- a/cmake.sh +++ b/cmake.sh @@ -224,7 +224,7 @@ elif [ -r /etc/issue ] ; then fi fi -pip3 install conan --upgrade +pip3 install conan==1.57.0 --upgrade if which conan ; then conan=$(which conan) diff --git a/packaging/rpm/centreon-collect.spec b/packaging/rpm/centreon-collect.spec index e49cba6147b..0eda288f103 100644 --- a/packaging/rpm/centreon-collect.spec +++ b/packaging/rpm/centreon-collect.spec @@ -241,7 +241,7 @@ centengine. %setup -q -n %{name}-%{version} %build -pip3 install conan --upgrade +pip3 install conan==1.57.0 --upgrade conan install . -s compiler.cppstd=14 -s compiler.libcxx=libstdc++11 --build=missing cmake3 \