WIP - playing around with using an nginx proxy to handle /v1 and /v2 for local dev

Author: alexcottner

.gitignore

@@ -74,3 +74,6 @@ attachments/
 
 # Visual Studio Code
 .vscode/
+
+# Git reader data
+git-reader/data

docker-compose.yml

@@ -26,6 +26,7 @@ services:
     user: root
     ports:
       - 8000:8000
+
   web:
     build:
       dockerfile: RemoteSettings.Dockerfile
@@ -36,21 +37,33 @@ services:
       - db
       - memcached
       - autograph
+    # ports:
+    #   - 8888:8888
     environment:
       - KINTO_CACHE_BACKEND=kinto.core.cache.memcached
       - KINTO_CACHE_HOSTS=memcached:11211 memcached:11212
       - KINTO_STORAGE_BACKEND=kinto.core.storage.postgresql
       - KINTO_STORAGE_URL=postgresql://postgres@db/postgres
       - KINTO_PERMISSION_BACKEND=kinto.core.permission.postgresql
       - KINTO_PERMISSION_URL=postgresql://postgres@db/postgres
-    ports:
-      - 8888:8888
     volumes:
       - ./config:/app/config
       - ./kinto-remote-settings:/app/kinto-remote-settings
       - debug-mail:/app/mail
       - attachments:/tmp/attachments
 
+  git-reader:
+    build:
+      context: git-reader/
+      args:
+        UID: 1000
+        GID: 1000
+    environment:
+      - GIT_REPO_PATH=/mnt/data/latest
+      - SELF_CONTAINED=true
+    volumes:
+      - ./git-reader/data:/mnt/data
+
   browser-tests:
     build:
       context: browser-tests/
@@ -68,3 +81,13 @@ services:
       context: cronjobs/
     image: remotesettings/cronjobs
     profiles: [cronjobs]
+
+  web-proxy:
+    image: openresty/openresty
+    ports:
+      - 8888:8888
+    volumes:
+      - ./nginx.conf:/etc/nginx/conf.d/default.conf
+    depends_on:
+      - web
+      - git-reader

git-reader/Dockerfile

@@ -1,5 +1,11 @@
+ARG UID=10001
+ARG GID=10001
+
 FROM python:3.14.0-slim-trixie
 
+ARG UID
+ARG GID
+
 ENV PIP_NO_CACHE_DIR=off \
     PIP_DISABLE_PIP_VERSION_CHECK=on \
     POETRY_NO_INTERACTION=1 \
@@ -16,9 +22,9 @@ RUN python -m venv $VIRTUAL_ENV && \
 
 WORKDIR /app
 
-RUN chown 10001:10001 /app && \
-    groupadd --gid 10001 app && \
-    useradd --no-create-home --uid 10001 --gid 10001 --home-dir /app app
+RUN chown ${UID}:${GID} /app
+RUN groupadd --gid ${GID} app
+RUN useradd --no-create-home --uid ${UID} --gid ${GID} --home-dir /app app
 
 RUN mkdir /app/.ssh && \
     ssh-keyscan github.com >> /app/.ssh/known_hosts && \

git-reader/app.py

@@ -361,6 +361,7 @@ def _get_file_content(
         refobj = self.repo.lookup_reference(f"refs/heads/{branch}")
         commit = self.repo[refobj.target]
         node = commit.tree
+        print(node)
 
         parts = [p for p in path.strip("/").split("/") if p]
         for i, name in enumerate(parts):

git-reader/poetry.lock

@@ -13,6 +13,7 @@ pygit2 = "^1.18.2"
 uvicorn = "^0.35.0"
 uvloop = "^0.21.0"
 pyjwt = "^2.10.1"
+lz4 = "^4.4.4"
 
 [tool.pytest.ini_options]
 pythonpath = ["."]

git-reader/pyproject.toml

@@ -0,0 +1,16 @@
+server {
+  listen 8888;
+  server_name localhost;
+
+  location / {
+    proxy_pass http://web:8888/;
+  }
+
+  location /v1 {
+    proxy_pass http://web:8888/v1;
+  }
+
+  location /v2 {
+    proxy_pass http://git-reader:8000/v2;
+  }
+}