From 2c06216eabf310166dd13fddcf6107899f9f8e25 Mon Sep 17 00:00:00 2001
From: wilson <18582007+0mWh@users.noreply.github.com>
Date: Sun, 11 Jan 2026 03:32:51 -0500
Subject: [PATCH 1/2] accommodate pip->poetry upstream

https://github.com/mozilla-services/syncstorage-rs/commit/f8715d4e916e5f3ef5431cb40ecdebd71b21fa7d#diff-78a8a19706dbd2a4425dd72bdab0502ed7a2cef16365ab7030a5a0588927bf47
---
 app/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/Dockerfile b/app/Dockerfile
index 72f14e5..0b0ae3d 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -1,7 +1,5 @@
 from rust:latest
 
-ARG GIT_COMMIT=1dc421474df2a4ee973d529534cd0eb7189d58ce
-
 # Create needed directories
 RUN mkdir /app /config
 WORKDIR /app
@@ -16,14 +14,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # Clone syncstorage-rs and build it
 RUN git clone https://github.com/mozilla-services/syncstorage-rs ./ \
-    && git checkout ${GIT_COMMIT} \
     && cargo install --path ./syncserver --no-default-features --features=syncstorage-db/mysql --locked \
     && cargo install diesel_cli --no-default-features --features 'mysql' \
     && cargo clean
 
 # Setup the Python venv
 RUN virtualenv venv \
-    && /app/venv/bin/pip install -r requirements.txt \
+    && /app/venv/bin/pip3 install flake8 hawkauthlib konfig pyramid pyramid_hawkauth requests simplejson unittest2 WebTest WSGIProxy2 poetry \
+    && /app/venv/bin/poetry self add poetry-plugin-export \
+    && /app/venv/bin/poetry install --without dev --with tokenserver-unit-tests --no-interaction --no-ansi \
     && /app/venv/bin/pip install -r tools/tokenserver/requirements.txt \
     && /app/venv/bin/pip install pyopenssl==22.1.0
 

From 104a526dd5d024a77773351e0e0ba3860c1eac8e Mon Sep 17 00:00:00 2001
From: wilson <18582007+0mWh@users.noreply.github.com>
Date: Sun, 11 Jan 2026 03:52:08 -0500
Subject: [PATCH 2/2] upstream rename

---
 app/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/entrypoint.sh b/app/entrypoint.sh
index 5b664fe..e95b802 100644
--- a/app/entrypoint.sh
+++ b/app/entrypoint.sh
@@ -4,7 +4,7 @@ sleep 5
 
 # First run all migrations
 /usr/local/cargo/bin/diesel --database-url "${SYNC_SYNCSTORAGE_DATABASE_URL}" migration --migration-dir syncstorage-mysql/migrations run
-/usr/local/cargo/bin/diesel --database-url "${SYNC_TOKENSERVER_DATABASE_URL}" migration --migration-dir tokenserver-db/migrations run
+/usr/local/cargo/bin/diesel --database-url "${SYNC_TOKENSERVER_DATABASE_URL}" migration --migration-dir tokenserver-mysql/migrations run
 
 # Parse token server database URL
 proto="$(echo $SYNC_TOKENSERVER_DATABASE_URL | grep :// | sed -e's,^\(.*://\).*,\1,g')"