diff --git a/dynalab/dockerfiles/Dockerfile.cuda b/dynalab/dockerfiles/Dockerfile.cuda index 2ed111f..0c82856 100644 --- a/dynalab/dockerfiles/Dockerfile.cuda +++ b/dynalab/dockerfiles/Dockerfile.cuda @@ -19,7 +19,7 @@ RUN apt-get update && \ ca-certificates \ dpkg-dev \ g++ \ - python3.6-dev \ + python3.7-dev \ python3-pip \ openjdk-11-jre-headless \ curl \ @@ -27,7 +27,7 @@ RUN apt-get update && \ git \ && rm -rf /var/lib/apt/lists/* -RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.6 1 +RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.7 1 RUN cd /tmp \ && curl -O https://bootstrap.pypa.io/get-pip.py \ && python3 get-pip.py @@ -49,7 +49,7 @@ WORKDIR /home/model-server/code RUN if [ -f requirements.txt ] && [ ${requirements} = True ]; then python -m pip install --no-cache-dir --force-reinstall -r requirements.txt; fi RUN if [ -f setup.py ] && [ ${setup} = True ]; then python -m pip install --no-cache-dir --force-reinstall -e .; fi -RUN python -m pip install --force-reinstall git+git://github.com/facebookresearch/dynalab.git@flores +RUN python -m pip install --force-reinstall git+https://github.com/facebookresearch/dynalab.git@flores ENV model_name=${model_name} ENV PYTHONIOENCODING=UTF-8 diff --git a/dynalab/dockerfiles/Dockerfile.dev b/dynalab/dockerfiles/Dockerfile.dev index 4870dda..919f7ca 100644 --- a/dynalab/dockerfiles/Dockerfile.dev +++ b/dynalab/dockerfiles/Dockerfile.dev @@ -19,7 +19,7 @@ RUN apt-get update && \ ca-certificates \ dpkg-dev \ g++ \ - python3.6-dev \ + python3.7-dev \ python3-pip \ openjdk-11-jdk \ curl \ @@ -27,7 +27,7 @@ RUN apt-get update && \ git \ && rm -rf /var/lib/apt/lists/* -RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.6 1 +RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.7 1 RUN cd /tmp \ && curl -O https://bootstrap.pypa.io/get-pip.py \ && python get-pip.py @@ -49,7 +49,7 @@ WORKDIR /home/model-server/code RUN if [ -f requirements.txt ] && [ ${requirements} = True ]; then python -m pip install --no-cache-dir --force-reinstall -r requirements.txt; fi RUN if [ -f setup.py ] && [ ${setup} = True ]; then python -m pip install --no-cache-dir --force-reinstall -e .; fi -RUN python -m pip install --force-reinstall git+git://github.com/facebookresearch/dynalab.git +RUN python -m pip install --force-reinstall git+https://github.com/facebookresearch/dynalab.git ENV model_name=${model_name} ENV PYTHONIOENCODING=UTF-8 diff --git a/dynalab/dockerfiles/prod/Dockerfile b/dynalab/dockerfiles/prod/Dockerfile index 7f1e09a..6d61e53 100644 --- a/dynalab/dockerfiles/prod/Dockerfile +++ b/dynalab/dockerfiles/prod/Dockerfile @@ -18,7 +18,7 @@ RUN apt-get update && \ ca-certificates \ dpkg-dev \ g++ \ - python3.6-dev \ + python3.7-dev \ python3-pip \ openjdk-11-jdk \ curl \ @@ -26,7 +26,7 @@ RUN apt-get update && \ git \ && rm -rf /var/lib/apt/lists/* -RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.6 1 +RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.7 1 RUN cd /tmp \ && curl -O https://bootstrap.pypa.io/get-pip.py \ && python3 get-pip.py @@ -46,7 +46,7 @@ WORKDIR /home/model-server/code RUN if [ -f requirements.txt ] && [ ${requirements} = True ]; then python -m pip install --no-cache-dir --force-reinstall -r requirements.txt; fi RUN if [ -f setup.py ] && [ ${setup} = True ]; then python -m pip install --no-cache-dir --force-reinstall -e .; fi -RUN python -m pip install --force-reinstall git+git://github.com/facebookresearch/dynalab.git +RUN python -m pip install --force-reinstall git+https://github.com/facebookresearch/dynalab.git ENV PYTHONIOENCODING=UTF-8 ENV MY_SECRET=${my_secret} diff --git a/dynalab_cli/test.py b/dynalab_cli/test.py index b630f85..ccb86f9 100644 --- a/dynalab_cli/test.py +++ b/dynalab_cli/test.py @@ -201,7 +201,7 @@ def run_docker_test(self, config): "docker", "run", "--network=none", - "--cpus=4", + "--cpus=2", "--memory=16G", repository_name, ]