we generate ubuntu containers arm and x64 as debian 11, 12

centreon · Jan 23, 2025 · d0f7285 · d0f7285
1 parent e1dd7a6
commit d0f7285
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 7 deletions.
diff --git a/.github/docker/Dockerfile.centreon-collect-debian-bullseye-test b/.github/docker/Dockerfile.centreon-collect-debian-bullseye-test
@@ -2,13 +2,16 @@ ARG REGISTRY_URL
 
 FROM ${REGISTRY_URL}/debian:bullseye
 
+#FROM debian:bullseye
+
 COPY . /tmp/collect
 
 RUN bash -e <<EOF
 
 apt-get update
 
 apt-get -y install curl \
+    aptitude \
     gcc \
     g++ \
     gdb \

diff --git a/.github/docker/Dockerfile.centreon-collect-ubuntu-jammy b/.github/docker/Dockerfile.centreon-collect-ubuntu-jammy
@@ -1,8 +1,11 @@
 ARG REGISTRY_URL
 
+ARG TRIPLET
+
 FROM ${REGISTRY_URL}/ubuntu:jammy
 
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
+
 
 RUN bash -e <<EOF
 
@@ -56,6 +59,10 @@ apt-get clean
 
 localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 
+if [ "${TRIPLET}" = "arm64-linux" ] ; then
+  export VCPKG_FORCE_SYSTEM_BINARIES=arm
+fi
+
 git clone --depth 1 -b 2024.01.12 https://github.com/Microsoft/vcpkg.git
 ./vcpkg/bootstrap-vcpkg.sh
 mkdir /src
@@ -66,14 +73,13 @@ COPY vcpkg.json /src
 COPY overlays /overlays
 COPY custom-triplets /custom-triplets
 
-ARG TRIPLET
 RUN bash -e <<EOF
 
 export VCPKG_ROOT=/vcpkg
 export PATH=$VCPKG_ROOT:$PATH
 
 if [ "${TRIPLET}" = "arm64-linux" ] ; then
-  export VCPKG_FORCE_SYSTEM_BINARIES=1
+  export VCPKG_FORCE_SYSTEM_BINARIES=arm
 fi
 vcpkg/vcpkg install --overlay-triplets=custom-triplets --triplet ${TRIPLET}-release --vcpkg-root vcpkg --x-wait-for-lock --x-manifest-root=/src --x-install-root=vcpkg_installed --overlay-ports=overlays
 

diff --git a/.github/docker/Dockerfile.centreon-collect-ubuntu-jammy-test b/.github/docker/Dockerfile.centreon-collect-ubuntu-jammy-test
@@ -0,0 +1,53 @@
+ARG REGISTRY_URL
+
+FROM ${REGISTRY_URL}/ubuntu:jammy
+
+#FROM ubuntu:jammy
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+COPY . /tmp/collect
+
+RUN bash -e <<EOF
+
+apt-get update
+
+apt-get install -y --no-install-recommends tzdata
+
+apt-get -y install aptitude \
+    curl \
+    fakeroot \
+    gdb \
+    git \
+    git-buildpackage \
+    libgcrypt20 \
+    libgnutls30 \
+    libmariadb3 \
+    libperl-dev \
+    libssh2-1 \
+    locales \
+    mariadb-server \
+    openssl \
+    python3 \
+    python3-pip \
+    rrdtool \
+    strace \
+    sudo \
+    zip \
+    zstd \
+    perl-base
+
+apt-get clean
+
+localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+
+pip3 install -U robotframework robotframework-databaselibrary robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil
+pip3 install grpcio grpcio_tools py-cpuinfo cython unqlite gitpython boto3 robotframework-requests
+
+cd /tmp/collect
+
+.github/scripts/collect-prepare-test-robot.sh mariadb
+
+/bin/rm -rf /tmp/collect
+
+EOF
diff --git a/.github/workflows/docker-builder.yml b/.github/workflows/docker-builder.yml
@@ -69,10 +69,14 @@ jobs:
             dockerfile: centreon-collect-debian-bookworm-test
             image: centreon-collect-debian-bookworm-test
             tag: ${{ needs.get-environment.outputs.test_img_version }}
-          # - runner: collect
-          #   dockerfile: centreon-collect-ubuntu-jammy
-          #   image: centreon-collect-ubuntu-jammy
-          #   tag: ${{ needs.get-environment.outputs.img_version }}
+          - runner: collect
+            dockerfile: centreon-collect-ubuntu-jammy
+            image: centreon-collect-ubuntu-jammy
+            tag: ${{ needs.get-environment.outputs.img_version }}
+          - runner: collect
+            dockerfile: centreon-collect-ubuntu-jammy-test
+            image: centreon-collect-ubuntu-jammy-test
+            tag: ${{ needs.get-environment.outputs.img_version }}
           - runner: collect-arm64
             dockerfile: centreon-collect-debian-bullseye
             image: centreon-collect-debian-bullseye-arm64
@@ -89,6 +93,14 @@ jobs:
             dockerfile: centreon-collect-debian-bookworm-test
             image: centreon-collect-debian-bookworm-arm64-test
             tag: ${{ needs.get-environment.outputs.test_img_version }}
+          - runner: collect-arm64
+            dockerfile: centreon-collect-ubuntu-jammy
+            image: centreon-collect-ubuntu-jammy-arm64
+            tag: ${{ needs.get-environment.outputs.img_version }}
+          - runner: collect-arm64
+            dockerfile: centreon-collect-ubuntu-jammy-test
+            image: centreon-collect-ubuntu-jammy-test-arm64
+            tag: ${{ needs.get-environment.outputs.img_version }}
 
     runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', matrix.runner)) }}
 
@@ -113,6 +125,8 @@ jobs:
           password: ${{ secrets.HARBOR_CENTREON_PUSH_TOKEN }}
 
       - uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
+        with:
+          driver-opts: image=${{ vars.DOCKER_PROXY_REGISTRY_URL }}/moby/buildkit:buildx-stable-1
 
       - name: Build image ${{ matrix.image }}:${{ matrix.tag }}
         uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0