From f3a6769daa7d99f445dc9454599a8ae79a3d2c85 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 25 May 2021 18:08:13 +0200 Subject: [PATCH] goto py3, do NOT install requirements ATM --- Dockerfile | 18 +++++++++--------- debian-packages.txt | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 18aa9d9c..f3cfc30d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM python:2 +FROM python:3 MAINTAINER Guillaume Pellerin @@ -35,18 +35,18 @@ RUN apt-get update && \ locale-gen && \ apt-get clean -RUN pip install -U pip +RUN pip3 install -U pip ENV LANG fr_FR.UTF-8 ENV LANGUAGE fr_FR:fr ENV LC_ALL fr_FR.UTF-8 -COPY requirements.txt /srv -RUN pip install -r requirements.txt +# COPY requirements.txt /srv +# RUN pip3 install -r requirements.txt -COPY lib /srv/lib -COPY bin/build/local/setup_lib_py2.sh /srv -RUN /srv/setup_lib_py2.sh +# COPY lib /srv/lib +# COPY bin/build/local/setup_lib.sh /srv +# RUN /srv/setup_lib.sh WORKDIR /srv/src/teleforma COPY setup.py /srv/src/teleforma @@ -55,8 +55,8 @@ COPY README.rst /srv/src/teleforma RUN python setup.py develop # Workaround for django installation bugs -RUN cp -ra /usr/local/django/* /usr/local/lib/python2.7/site-packages/django/ -RUN cp -ra /usr/local/django_extensions/* /usr/local/lib/python2.7/site-packages/django_extensions/ +# RUN cp -ra /usr/local/django/* /usr/local/lib/python2.7/site-packages/django/ +# RUN cp -ra /usr/local/django_extensions/* /usr/local/lib/python2.7/site-packages/django_extensions/ WORKDIR /srv/app diff --git a/debian-packages.txt b/debian-packages.txt index a2201051..f80b5282 100644 --- a/debian-packages.txt +++ b/debian-packages.txt @@ -3,8 +3,8 @@ netcat vim locales ipython -python-setuptools -python-mysqldb -python-psycopg2 -python-yaml +python3-setuptools +python3-mysqldb +python3-psycopg2 +python3-yaml uwsgi \ No newline at end of file -- 2.39.5