dockerfiles: migrate to gRPC

Signed-off-by: Bastian Krause <[email protected]>

Author: Bastian-Krause

.gitignore

@@ -18,6 +18,6 @@
 /.pytest_cache/
 /htmlcov/
 /labgrid/_version.py
-/dockerfiles/staging/crossbar/*
-!/dockerfiles/staging/crossbar/places_example.yaml
+/dockerfiles/staging/coordinator/*
+!/dockerfiles/staging/coordinator/places_example.yaml
 /.idea

dockerfiles/Dockerfile

@@ -1,4 +1,5 @@
 FROM debian:bookworm-slim AS labgrid-base
+ARG VERSION
 
 LABEL maintainer="[email protected]"
 
@@ -8,10 +9,12 @@ COPY ./ /opt/labgrid/
 
 RUN set -e ;\
     apt update -q=2 ;\
-    apt install -q=2 --yes --no-install-recommends python3 python3-dev python3-pip python3-setuptools git build-essential libsnappy-dev ;\
+    apt install -q=2 --yes --no-install-recommends python3 python3-dev python3-pip python3-setuptools git build-essential ;\
     pip3 install --break-system-packages -U pip;\
     apt clean ;\
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* ;\
+    cd /opt/labgrid ;\
+    SETUPTOOLS_SCM_PRETEND_VERSION="$VERSION" pip3 install --break-system-packages --no-cache-dir .
 
 #
 # Client
@@ -20,9 +23,7 @@ FROM labgrid-base AS labgrid-client
 ARG VERSION
 
 RUN set -e ;\
-    cd /opt/labgrid ;\
     pip3 install --break-system-packages yq ;\
-    SETUPTOOLS_SCM_PRETEND_VERSION="$VERSION" pip3 install --break-system-packages --no-cache-dir . ;\
     apt update -q=2 ;\
     apt install -q=2 --yes --no-install-recommends microcom openssh-client rsync jq qemu-system qemu-utils ;\
     apt clean ;\
@@ -36,21 +37,13 @@ CMD ["/bin/bash"]
 FROM labgrid-base AS labgrid-coordinator
 ARG VERSION
 
-ENV CROSSBAR_DIR=/opt/crossbar
-
-RUN set -e ;\
-    cd /opt/labgrid ;\
-    pip3 install --break-system-packages virtualenv ;\
-    SETUPTOOLS_SCM_PRETEND_VERSION="$VERSION" pip3 install --break-system-packages --no-cache-dir . ;\
-    virtualenv -p python3 crossbar-venv ;\
-    crossbar-venv/bin/pip3 install --break-system-packages -r crossbar-requirements.txt ;\
-    sed -i "s#^  executable: .*\$#  executable: python3#" .crossbar/config-anonymous.yaml
-
-VOLUME /opt/crossbar
+VOLUME /opt/coordinator
 
 EXPOSE 20408
 
-CMD ["/opt/labgrid/crossbar-venv/bin/crossbar", "start", "--config", "/opt/labgrid/.crossbar/config-anonymous.yaml"]
+WORKDIR /opt/coordinator
+
+CMD ["/usr/local/bin/labgrid-coordinator"]
 
 #
 # Exporter
@@ -61,8 +54,6 @@ ARG VERSION
 COPY dockerfiles/exporter/entrypoint.sh /entrypoint.sh
 
 RUN set -e ;\
-    cd /opt/labgrid ;\
-    SETUPTOOLS_SCM_PRETEND_VERSION="$VERSION" pip3 install --break-system-packages --no-cache-dir . ;\
     apt update -q=2 ;\
     apt install -q=2 --yes --no-install-recommends ser2net ;\
     apt clean ;\

dockerfiles/README.rst

@@ -5,7 +5,7 @@ This folder contains Dockerfile's for building Docker images
 for the 3 different components of a Labgrid distributed infrastructure.
 
 - **labgrid-coordinator**
-  An image for with crossbar which can be used to run
+  An image with the Labgrid coordinator.
   a Labgrid coordinator instance.
 - **labgrid-client**
   An image with the Labgrid client tools and pytest integration.
@@ -64,18 +64,18 @@ No policy or configuration is done.
 labgrid-coordinator usage
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The labgrid-coordinator comes with a preconfigured Crossbar.io server.
+The labgrid-coordinator image can be used to run a coordinator instance.
 
-It listens to port 20408,
+It listens on port 20408,
 so you probably want to publish that so you can talk to the coordinator.
 
-State is written to ``/opt/crossbar``.
+State is written to ``/opt/coordinator``.
 You might want to bind a volume to that
-so you can restart the service without loosing state.
+so you can restart the service without losing state.
 
 .. code-block:: bash
 
-   $ docker run -t -p 20408:20408 -v $HOME/crossbar:/opt/crossbar \
+   $ docker run -t -p 20408:20408 -v $HOME/coordinator:/opt/coordinator \
 	 docker.io/labgrid/coordinator
 
 
@@ -85,18 +85,18 @@ labgrid-client usage
 The labgrid-client image can be used to
 run ``labgrid-client`` and ``pytest`` commands.
 For example listing available places registered at coordinator at
-ws://192.168.1.42:20408/ws
+192.168.1.42:20408
 
 .. code-block:: bash
 
-   $ docker run -e LG_CROSSBAR=ws://192.168.1.42:20408/ws docker.io/labgrid/client \
+   $ docker run -e LG_COORDINATOR=192.168.1.42:20408 docker.io/labgrid/client \
 	 labgrid-client places
 
 Or running all pytest/labgrid tests at current directory:
 
 .. code-block:: bash
 
-   $ docker run -e LG_CROSSBAR=ws://192.168.1.42:20408/ws docker.io/labgrid/client \
+   $ docker run -e LG_COORDINATOR=192.168.1.42:20408 docker.io/labgrid/client \
 	 pytest
 
 
@@ -113,7 +113,7 @@ Start it with something like:
 
 .. code-block:: bash
 
-   $ docker run -e LG_CROSSBAR=ws://192.168.1.42:20408/ws \
+   $ docker run -e LG_COORDINATOR=192.168.1.42:20408 \
        -v $HOME/exporter-conf:/opt/conf \
 	 docker.io/labgrid/exporter
 

dockerfiles/staging/crossbar/places_example.yaml renamed to dockerfiles/staging/coordinator/places_example.yaml

@@ -2,11 +2,11 @@ services:
   coordinator:
     image: "${IMAGE_PREFIX:-docker.io/labgrid/}coordinator"
     volumes:
-      - "./crossbar:/home/root/crossbar"
+      - "./coordinator:/home/root/coordinator"
     tty: true
     network_mode: "host"
-    command: bash -c "cp /home/root/crossbar/places_example.yaml /opt/crossbar/places.yaml &&
-      /opt/labgrid/crossbar-venv/bin/crossbar start --config /opt/labgrid/.crossbar/config-anonymous.yaml"
+    command: bash -c "cp /home/root/coordinator/places_example.yaml /opt/coordinator/places.yaml &&
+      /usr/local/bin/labgrid-coordinator"
   client:
     image: "${IMAGE_PREFIX:-docker.io/labgrid/}client"
     volumes: