From 529dafc6f2d6289c8373681ba18b86a775271c44 Mon Sep 17 00:00:00 2001 From: Louis Sautier Date: Wed, 2 Sep 2020 21:58:03 +0200 Subject: [PATCH 1/2] Update requirements to fix sync with useOAuthForSyncToken enabled This fixes authentication with identity.sync.useOAuthForSyncToken enabled which requires newer tokenserver and syncstorage versions. Closes: https://github.com/mozilla-services/syncserver/issues/218 Closes: https://github.com/mozilla-services/syncserver/issues/225 --- Dockerfile | 2 +- requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1196a20..319e2bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ WORKDIR /app COPY ./requirements.txt /app/requirements.txt COPY ./dev-requirements.txt /app/dev-requirements.txt RUN apk --no-cache update \ - && apk add dumb-init libstdc++ libffi-dev openssl-dev g++ \ + && apk add bash dumb-init gcc libstdc++ libffi-dev make mysql-dev musl-dev ncurses-dev openssl-dev g++ \ && pip install --upgrade pip \ && pip install --upgrade --no-cache-dir -r requirements.txt \ && pip install --upgrade --no-cache-dir -r dev-requirements.txt \ diff --git a/requirements.txt b/requirements.txt index 39b60ca..d9b1c18 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,5 +10,5 @@ configparser==3.5 mozsvc==0.9 futures==3.0 soupsieve==1.9.5 -https://github.com/mozilla-services/tokenserver/archive/1.4.5.zip -https://github.com/mozilla-services/server-syncstorage/archive/1.6.14.zip +https://github.com/mozilla-services/tokenserver/archive/1.5.11.zip +https://github.com/mozilla-services/server-syncstorage/archive/1.8.0.zip From 2761288375ef188b7bd7f0170d01b5b5dc2418d1 Mon Sep 17 00:00:00 2001 From: Ryan Kelly Date: Thu, 3 Sep 2020 13:05:10 +1000 Subject: [PATCH 2/2] Add explicit dependency on umemcache. I don't really know why this is necessary but I'm hoping it will get the tests passing on CI. It shouldn't be required for actual running of the server. --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index d9b1c18..d6eb6a8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,5 +10,6 @@ configparser==3.5 mozsvc==0.9 futures==3.0 soupsieve==1.9.5 +umemcache==1.6.3 https://github.com/mozilla-services/tokenserver/archive/1.5.11.zip https://github.com/mozilla-services/server-syncstorage/archive/1.8.0.zip