From 824ddbd505e4542af29396faf575a1341ce03d48 Mon Sep 17 00:00:00 2001 From: vsoch Date: Sun, 28 May 2023 17:19:51 -0600 Subject: [PATCH 1/2] add testing prometheus build Signed-off-by: vsoch --- prometheus/Dockerfile | 259 +++++++++++++++++++++++++++++++++++++++ prometheus/uptodate.yaml | 7 ++ 2 files changed, 266 insertions(+) create mode 100644 prometheus/Dockerfile create mode 100644 prometheus/uptodate.yaml diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile new file mode 100644 index 0000000..5fecbb4 --- /dev/null +++ b/prometheus/Dockerfile @@ -0,0 +1,259 @@ +ARG tag=bionic +FROM ubuntu:${tag} + +# docker build -t rse-ops/flux-tree . + +# This first section from src/test/docker/bionic/Dockerfile in flux-core +# https://github.com/flux-framework/flux-core/blob/master/src/test/docker/bionic/Dockerfile +RUN apt-get update && \ + apt-get -qq install -y --no-install-recommends \ + apt-utils && \ + rm -rf /var/lib/apt/lists/* + +# Utilities +RUN apt-get update && \ + apt-get -qq install -y --no-install-recommends \ + locales \ + ca-certificates \ + wget \ + man \ + git \ + flex \ + ssh \ + sudo \ + vim \ + luarocks \ + munge \ + lcov \ + ccache \ + lua5.2 \ + mpich \ + valgrind \ + jq && \ + rm -rf /var/lib/apt/lists/* + +# Compilers, autotools +RUN apt-get update && \ + apt-get -qq install -y --no-install-recommends \ + build-essential \ + pkg-config \ + autotools-dev \ + libtool \ + autoconf \ + automake \ + make \ + cmake \ + clang-6.0 \ + clang-tidy \ + gcc-8 \ + g++-8 && \ + rm -rf /var/lib/apt/lists/* + +# Python +# NOTE: sudo pip install is necessary to get differentiated installations of +# python binary components for multiple python3 variants, --ignore-installed +# makes it ignore local versions of the packages if your home directory is +# mapped into the container and contains the same libraries +RUN apt-get update && \ + apt-get -qq install -y --no-install-recommends \ + libffi-dev \ + python3-dev \ + python3.7-dev \ + python3.8-dev \ + python3-pip \ + python3-setuptools \ + python3-wheel && \ + rm -rf /var/lib/apt/lists/* + +RUN for PY in python3.6 python3.7 python3.8 ; do \ + sudo $PY -m pip install --upgrade --ignore-installed \ + "markupsafe==2.0.0" \ + coverage cffi ply six pyyaml "jsonschema>=2.6,<4.0" \ + sphinx sphinx-rtd-theme sphinxcontrib-spelling; \ + sudo mkdir -p /usr/lib/${PY}/dist-packages; \ + echo ../site-packages >/tmp/site-packages.pth; \ + sudo mv /tmp/site-packages.pth /usr/lib/${PY}/dist-packages; \ + done ; \ + apt-get -qq purge -y python3-pip && \ + apt-get -qq autoremove -y + +# Other deps +RUN apt-get update && \ + apt-get -qq install -y --no-install-recommends \ + libsodium-dev \ + libzmq3-dev \ + libczmq-dev \ + libjansson-dev \ + libmunge-dev \ + libncursesw5-dev \ + liblua5.2-dev \ + liblz4-dev \ + libsqlite3-dev \ + uuid-dev \ + libhwloc-dev \ + libmpich-dev \ + libs3-dev \ + libevent-dev \ + libarchive-dev \ + libpam-dev && \ + rm -rf /var/lib/apt/lists/* + +# Testing utils and libs +RUN apt-get update && \ + apt-get -qq install -y --no-install-recommends \ + faketime \ + libfaketime \ + pylint \ + cppcheck \ + enchant \ + aspell \ + aspell-en && \ + rm -rf /var/lib/apt/lists/* + +RUN locale-gen en_US.UTF-8 + +# NOTE: luaposix installed by rocks due to Ubuntu bug: #1752082 https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082 +RUN luarocks install luaposix + +# Install caliper by hand for now +WORKDIR /opt/caliper +RUN wget -O - https://github.com/LLNL/Caliper/archive/v1.7.0.tar.gz | tar xvz --strip-components 1 && \ + mkdir build && \ + cd build && \ + CC=gcc CXX=g++ cmake .. -DCMAKE_INSTALL_PREFIX=/usr && \ + make -j 4 && \ + make install && \ + cd ../.. && \ + rm -rf caliper + +# Install openpmix, prrte +WORKDIR /opt/prrte +RUN git clone https://github.com/openpmix/openpmix.git && \ + git clone https://github.com/openpmix/prrte.git && \ + ls -l && \ + set -x && \ + cd openpmix && \ + git checkout fefaed568f33bf86f28afb6e45237f1ec5e4de93 && \ + ./autogen.pl && \ + ./configure --prefix=/usr --disable-static && make -j 4 install && \ + ldconfig && \ + cd .. && \ + cd prrte && \ + git checkout 477894f4720d822b15cab56eee7665107832921c && \ + ./autogen.pl && \ + ./configure --prefix=/usr && make -j 4 install && \ + cd ../.. && \ + rm -rf prrte + +ENV LANG=C.UTF-8 + +# This is from the docker check script (run interactively during a test) +# https://github.com/flux-framework/flux-core/blob/master/src/test/docker/checks/Dockerfile +ARG USER=fluxuser +ARG UID=1000 +ARG GID=1000 +ARG FLUX_SECURITY_VERSION=0.8.0 + +# Install flux-security by hand for now: +# +WORKDIR /opt +RUN CCACHE_DISABLE=1 && \ + V=$FLUX_SECURITY_VERSION && \ + PKG=flux-security-$V && \ + URL=https://github.com/flux-framework/flux-security/releases/download && \ + wget ${URL}/v${V}/${PKG}.tar.gz && \ + tar xvfz ${PKG}.tar.gz && \ + cd ${PKG} && \ + ./configure --prefix=/usr --sysconfdir=/etc || cat config.log && \ + make -j 4 && \ + make install && \ + cd .. && \ + rm -rf flux-security-* + +# Add configured user to image with sudo access: +# +RUN set -x && groupadd -g $UID $USER && \ + useradd -g $USER -u $UID -d /home/$USER -m $USER && \ + printf "$USER ALL= NOPASSWD: ALL\\n" >> /etc/sudoers + +# Setup MUNGE directories & key +RUN mkdir -p /var/run/munge && \ + dd if=/dev/urandom bs=1 count=1024 > /etc/munge/munge.key && \ + chown -R munge /etc/munge/munge.key /var/run/munge && \ + chmod 600 /etc/munge/munge.key + +# Install dependencies for prometheus +RUN sudo apt-get install -y texinfo && \ + git clone https://github.com/scottjg/libmicrohttpd /tmp/micro && \ + cd /tmp/micro && \ + ./bootstrap && \ + ./configure --prefix=/usr && \ + make && \ + sudo make install + +RUN git clone https://github.com/digitalocean/prometheus-client-c /tmp/prometheus-client-c && \ + cd /tmp/prometheus-client-c/prom && \ + mkdir _build && \ + cd _build && \ + cmake ../ && \ + make && \ + sudo make install && \ + cd /tmp/prometheus-client-c/promhttp && \ + mkdir _build && \ + cd _build && \ + cmake ../ && \ + make && \ + sudo make install + +# Build flux core +# This I added and copied how to build with caliper / flux security enabled +# https://github.com/flux-framework/flux-core/blob/master/src/test/docker/docker-run-checks.sh#L185-L191 +RUN git clone -b add/prometheus-plugin https://github.com/researchapps/flux-core && \ + cd flux-core && \ + ./autogen.sh && \ + ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-prometheus \ + --with-systemdsystemunitdir=/etc/systemd/system \ + --localstatedir=/var \ + --with-flux-security \ + --enable-caliper && \ + make clean && \ + make && \ + sudo make install + +# This is from the same src/test/docker/bionic/Dockerfile but in flux-sched +# Flux-sched deps +RUN sudo apt-get update +RUN sudo apt-get -qq install -y --no-install-recommends \ + libboost-graph-dev \ + libboost-system-dev \ + libboost-filesystem-dev \ + libboost-regex-dev \ + python-yaml \ + libyaml-cpp-dev \ + libedit-dev + +# Build Flux Sched +# https://github.com/flux-framework/flux-sched/blob/master/src/test/docker/docker-run-checks.sh#L152-L158 +RUN git clone --depth 1 https://github.com/flux-framework/flux-sched && \ + cd flux-sched && \ + ./autogen.sh && \ + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-systemdsystemunitdir=/etc/systemd/system \ + --localstatedir=/var \ + --with-flux-security \ + --enable-caliper && \ + make && \ + sudo make install + +# Note I ran this manually - didn't check to see if works in build (4th line might be interactive +RUN sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 1 && \ + sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 2 && \ + sudo update-alternatives --config python3 && \ + wget https://bootstrap.pypa.io/get-pip.py && \ + python3 get-pip.py + +# enable flux-tree to be "flux tree" +RUN cp /opt/flux-sched/t/scripts/flux-tree* /usr/libexec/flux/cmd/ +WORKDIR /opt/flux-core + diff --git a/prometheus/uptodate.yaml b/prometheus/uptodate.yaml new file mode 100644 index 0000000..d95e549 --- /dev/null +++ b/prometheus/uptodate.yaml @@ -0,0 +1,7 @@ +dockerbuild: + + build_args: + ubuntu_version: + key: ubuntu + versions: + - "bionic" From e2119586f0c0d06dd6fd6ee56742f13384a55811 Mon Sep 17 00:00:00 2001 From: vsoch Date: Sun, 28 May 2023 17:21:27 -0600 Subject: [PATCH 2/2] add module load test Signed-off-by: vsoch --- prometheus/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile index 5fecbb4..ebfbd15 100644 --- a/prometheus/Dockerfile +++ b/prometheus/Dockerfile @@ -210,6 +210,7 @@ RUN git clone https://github.com/digitalocean/prometheus-client-c /tmp/prometheu # https://github.com/flux-framework/flux-core/blob/master/src/test/docker/docker-run-checks.sh#L185-L191 RUN git clone -b add/prometheus-plugin https://github.com/researchapps/flux-core && \ cd flux-core && \ + echo "modload 0 prometheus" >> /etc/rc1 && \ ./autogen.sh && \ ./configure --prefix=/usr --sysconfdir=/etc \ --enable-prometheus \