Merge pull request #112 from icgood/fix-docker

Install requirements-all.txt in Dockerfile
icgood · May 9, 2021 · e9a1945 · e9a1945
2 parents cdb1efa + 1824cfc
commit e9a1945
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,12 +1,13 @@
 FROM python:3.9-alpine
 
+WORKDIR /pymap
+COPY . .
+
 RUN pip install -U pip wheel setuptools typing-extensions
 
-ARG install_arg="pymap[redis,admin,macaroon,sieve,optional]"
-ARG install_source=""
 RUN apk --update add --virtual build-dependencies \
     build-base python3-dev libffi-dev \
-  && pip install "${install_arg}${install_source}" \
+  && pip install -r requirements-all.txt \
   && apk del build-dependencies
 
 EXPOSE 143 4190 50051

diff --git a/docker/hooks/build b/docker/hooks/build
diff --git a/requirements-all.txt b/requirements-all.txt
@@ -0,0 +1 @@
+-e '.[redis,admin,macaroon,sieve,swim,optional]'
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -6,4 +6,4 @@ pytest-asyncio
 pytest-cov
 rope
 
--e '.[redis,admin,macaroon,sieve,swim,optional]'
+-r requirements-all.txt
diff --git a/setup.py b/setup.py
@@ -28,7 +28,7 @@
     license = f.read()
 
 setup(name='pymap',
-      version='0.24.3',
+      version='0.24.4',
       author='Ian Good',
       author_email='ian@icgood.net',
       description='Lightweight, asynchronous IMAP serving in Python.',