Docker: The new installation process

Author: gollux

Dockerfile

@@ -1,60 +1,72 @@
 # syntax=docker/dockerfile:1
 FROM ubuntu:24.04
 
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    build-essential \
-    cgroup-lite \
-    cppreference-doc-en-html \
-    fp-compiler \
-    git \
-    ghc \
-    libcap-dev \
-    libcups2-dev \
-    libffi-dev \
-    libpq-dev \
-    libyaml-dev \
-    mono-mcs \
-    openjdk-8-jdk-headless \
-    php-cli \
-    postgresql-client \
-    pypy3 \
-    python3-pip \
-    python3.12 \
-    python3.12-dev \
-    rustc \
-    shared-mime-info \
-    sudo \
-    wait-for-it \
-    zip
-
-# Create cmsuser user with sudo privileges
-RUN useradd -ms /bin/bash cmsuser && \
-    usermod -aG sudo cmsuser
-# Disable sudo password
-RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-# Set cmsuser as default user
-USER cmsuser
+RUN \
+    export DEBIAN_FRONTEND=noninteractive ; \
+    apt update && \
+    apt upgrade -y && \
+    apt install -y \
+        build-essential \
+        cgroup-lite \
+        cppreference-doc-en-html \
+        curl \
+        fp-compiler \
+        git \
+        ghc \
+        libcap-dev \
+        libcups2-dev \
+        libffi-dev \
+        libpq-dev \
+        libyaml-dev \
+        mono-mcs \
+        openjdk-8-jdk-headless \
+        php-cli \
+        postgresql-client \
+        pypy3 \
+        python3-pip \
+        python3-venv \
+        python3.12 \
+        python3.12-dev \
+        rustc \
+        shared-mime-info \
+        sudo \
+        wait-for-it \
+        zip
+
+RUN \
+    export DEBIAN_FRONTEND=noninteractive ; \
+    echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/isolate.asc] http://www.ucw.cz/isolate/debian/ bookworm-isolate main" >/etc/apt/sources.list.d/isolate.list && \
+    curl https://www.ucw.cz/isolate/debian/signing-key.asc >/etc/apt/keyrings/isolate.asc && \
+    apt update && \
+    apt install -y isolate && \
+    sed -i 's@^cg_root .*@cg_root = /sys/fs/cgroup@' /etc/isolate
 
-RUN mkdir /home/cmsuser/cms
-COPY --chown=cmsuser:cmsuser requirements.txt dev-requirements.txt /home/cmsuser/cms/
+# Create cmsuser user with sudo privileges and access to isolate
+RUN \
+    useradd -ms /bin/bash cmsuser && \
+    usermod -aG sudo cmsuser && \
+    usermod -aG isolate cmsuser && \
+    # Disable sudo password \
+    echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
-WORKDIR /home/cmsuser/cms
+# Set cmsuser as default user
+USER cmsuser
+ENV LANG=C.UTF-8
 
-RUN sudo pip3 install --break-system-packages -r requirements.txt
-RUN sudo pip3 install --break-system-packages -r dev-requirements.txt
+RUN mkdir /home/cmsuser/src
+COPY --chown=cmsuser:cmsuser install.py constraints.txt /home/cmsuser/src/
 
-COPY --chown=cmsuser:cmsuser . /home/cmsuser/cms
+WORKDIR /home/cmsuser/src
 
-RUN sudo pip3 install --break-system-packages .
+RUN ./install.py venv
+ENV PATH="/home/cmsuser/cms/bin:$PATH"
 
-RUN sudo python3 prerequisites.py --yes --cmsuser=cmsuser install
+COPY --chown=cmsuser:cmsuser . /home/cmsuser/src
 
-RUN sed 's|/cmsuser:your_password_here@localhost:5432/cmsdb"|/postgres@testdb:5432/cmsdbfortesting"|' ./config/cms.sample.toml \
-    | sudo tee /usr/local/etc/cms-testdb.toml
-RUN sed -e 's|/cmsuser:your_password_here@localhost:5432/cmsdb"|/postgres@devdb:5432/cmsdb"|' -e 's/127.0.0.1/0.0.0.0/' ./config/cms.sample.toml \
-    | sudo tee /usr/local/etc/cms-devdb.toml
-RUN sed 's/127.0.0.1/0.0.0.0/' ./config/cms_ranking.sample.toml | sudo tee /usr/local/etc/cms_ranking.toml
+RUN ./install.py cms --devel
 
-ENV LANG C.UTF-8
+RUN sed 's|/cmsuser:your_password_here@localhost:5432/cmsdb"|/postgres@testdb:5432/cmsdbfortesting"|' ./config/cms.sample.toml >../cms/etc/cms-testdb.toml
+RUN sed -e 's|/cmsuser:your_password_here@localhost:5432/cmsdb"|/postgres@devdb:5432/cmsdb"|' -e 's/127.0.0.1/0.0.0.0/' ./config/cms.sample.toml >../cms/etc/cms-devdb.toml
+RUN sed -i 's/127.0.0.1/0.0.0.0/' ../cms/etc/cms_ranking.toml
 
-CMD [""]
+CMD ["/bin/bash"]

docker-compose.dev.yml

@@ -4,17 +4,17 @@ services:
     environment:
       POSTGRES_HOST_AUTH_METHOD: trust
     volumes:
-      - "./.dev/postgres-data:/var/lib/postgresql/data"
+      - "../.dev/postgres-data:/var/lib/postgresql/data"
 
   devcms:
-    build: .
+    build: ..
     depends_on:
       - "devdb"
     environment:
-      CMS_CONFIG: /usr/local/etc/cms-devdb.toml
+      CMS_CONFIG: /home/cmsuser/cms/etc/cms-devdb.toml
     volumes:
       - "./.dev/home:/home/cmsuser"
-      - ".:/home/cmsuser/cms"
+      - "..:/home/cmsuser/src"
     privileged: true
     cgroup: host
     command: >

docker-compose.test.yml

@@ -5,27 +5,27 @@ services:
       POSTGRES_HOST_AUTH_METHOD: trust
 
   testcms:
-    build: .
+    build: ..
     depends_on:
       - "testdb"
     environment:
-      CMS_CONFIG: /usr/local/etc/cms-testdb.toml
+      CMS_CONFIG: /home/cmsuser/cms/etc/cms-testdb.toml
       # Could be removed in the future, see:
       # - https://github.com/pytest-dev/pytest/issues/7443
       # - https://github.com/actions/runner/issues/241
       PYTEST_ADDOPTS: --color=yes
     volumes:
-      - "./codecov:/home/cmsuser/cms/codecov"
+      - "./codecov:/home/cmsuser/src/codecov"
     privileged: true
     cgroup: host
-    command: wait-for-it testdb:5432 -- ./_cms-test-internal.sh
+    command: wait-for-it testdb:5432 -- docker/_cms-test-internal.sh
 
   stresstestcms:
-    build: .
+    build: ..
     depends_on:
       - "testdb"
     environment:
-      CMS_CONFIG: /usr/local/etc/cms-testdb.toml
+      CMS_CONFIG: /home/cmsuser/cms/etc/cms-testdb.toml
     privileged: true
     cgroup: host
-    command: wait-for-it testdb:5432 -- ./_cms-stresstest-internal.sh
+    command: wait-for-it testdb:5432 -- docker/_cms-stresstest-internal.sh