Add logging container

Author: ari-kl

.github/workflows/docker-build-amd64.yml .github/workflows/docker-build-logs.yml.github/workflows/docker-build-amd64.yml renamed to .github/workflows/docker-build-logs.yml

@@ -1,4 +1,4 @@
-name: Docker Build linux/amd64
+name: Docker Build Logs
 
 on:
   push:
@@ -24,22 +24,26 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/${{ github.repository }}
+          images: ghcr.io/${{ github.repository }}-logs
           tags: |
-            type=raw,value=amd64-latest
-            type=raw,value=amd64-${{ github.sha }}
+            type=raw,value=latest
+            type=raw,value=${{ github.sha }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
-          context: .
+          file: ./Dockerfile.logs
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/docker-build-arm64.yml .github/workflows/docker-build-server.yml.github/workflows/docker-build-arm64.yml renamed to .github/workflows/docker-build-server.yml

@@ -1,4 +1,4 @@
-name: Docker Build linux/arm64
+name: Docker Build Server
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build-and-push:
-    runs-on: ubuntu-24.04-arm
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write # Required for pushing to GHCR
@@ -24,22 +24,26 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/${{ github.repository }}
+          images: ghcr.io/${{ github.repository }}-server
           tags: |
-            type=raw,value=arm64-latest
-            type=raw,value=arm64-${{ github.sha }}
+            type=raw,value=latest
+            type=raw,value=${{ github.sha }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
-          context: .
+          file: ./Dockerfile.server
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile.logs

@@ -0,0 +1,28 @@
+FROM python:3.13
+
+# Install uv
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+WORKDIR /app
+
+# Install dependencies
+# Use host dependencies by default during development to improve build times
+RUN --mount=type=cache,target=/root/.cache/uv \
+    --mount=type=bind,source=uv.lock,target=uv.lock \
+    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
+    uv sync --locked --no-install-project
+
+# Copy the project into the image
+ADD pyproject.toml uv.lock /app/
+ADD qretproptools/cli/see_logs /app/qretproptools/cli/see_logs
+
+# Dependencies require the packages to exist
+RUN mkdir /app/libqretprop
+RUN touch /app/libqretprop/__init__.py /app/qretproptools/__init__.py
+
+RUN ls -l /app
+
+# Sync the project
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --locked
+
+CMD ["uv", "run", "see_logs", "-e", "-d", "-s"]

Dockerfile Dockerfile.serverDockerfile renamed to Dockerfile.server

@@ -1,13 +1,14 @@
 services:
   server:
     # Build the image from the Dockerfile in the current directory
-    build: .
+    build:
+      context: .
+      dockerfile: Dockerfile.server
     ports:
       - "8000:8000"
     depends_on:
       - redis
-    environment:
-      REDIS_HOST: localhost
+      - logs
     network_mode: "host"  # Use host networking for SSDP
 
     # Allow manual interaction with the container (cli)
@@ -18,15 +19,32 @@ services:
       watch:
         # Sync the working directory with the `/app` directory in the container
         - action: sync+restart
-          path: .
-          target: /app
+          path: ./libqretprop
+          target: /app/libqretprop
           # Exclude the project virtual environment
           ignore:
             - .venv/
 
         # Rebuild the image if dependencies change by checking uv.lock
         - action: rebuild
           path: ./uv.lock
+  logs:
+    build:
+      context: .
+      dockerfile: Dockerfile.logs
+    depends_on:
+      - redis
+    environment:
+      REDIS_HOST: redis
+    tty: true
+
+    develop:
+      watch:
+        # Sync script changes for development
+        - action: sync+restart
+          path: ./qretproptools/cli/see_logs
+          target: /app/qretproptools/cli/see_logs
+
   redis:
     image: "redis:latest"
     ports:
@@ -37,7 +55,8 @@ services:
 
     develop:
       watch:
-        # Sync the working directory with the `/app` directory in the container
+        # Restart on redis.conf changes
+        # Sync doesn't actually work here because of the volume mount
         - action: sync+restart
           path: redis.conf
           target: /usr/local/etc/redis/redis.conf

compose.yml

@@ -4,6 +4,8 @@
 import redis
 import redis.exceptions
 
+import os
+
 
 def main() -> None:
     parser = argparse.ArgumentParser(description="Tap into QRET logs via Redis.")
@@ -21,16 +23,19 @@ def main() -> None:
     print(f"Listening to channels: {', '.join(channels)}")
 
     try:
+        REDIS_HOST = os.getenv("REDIS_HOST", "localhost")
+
         while True:
             r = None
             pubsub = None
 
             try:
-                r = redis.Redis(host="localhost",
+
+                r = redis.Redis(host=REDIS_HOST,
                               port=6379,
                               db=0,
-                              username="roclient",
-                              password="password",
+                              username="server",
+                              password="propteambestteam",
                               decode_responses=True,
                               )
                 pubsub = r.pubsub()