diff --git a/Dockerfile b/Dockerfile index bec0cc4..ef513a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,12 @@ FROM ubuntu:bionic as builder +#SHELL ["/bin/bash", "-c"] + RUN echo 'APT::Install-Recommends 0;' >> /etc/apt/apt.conf.d/01norecommends \ && echo 'APT::Install-Suggests 0;' >> /etc/apt/apt.conf.d/01norecommends \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y bash mysql-client vim.tiny wget sudo net-tools ca-certificates unzip apt-transport-https \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal libmysqlclient-dev libxml2-dev libxslt-dev python-dev libffi-dev gcc libssl-dev gettext \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal python-dev libmysqlclient-dev libxml2-dev libxslt-dev python-dev libffi-dev gcc libssl-dev gettext \ && DEBIAN_FRONTEND=noninteractive apt-get install -y python-pip python-setuptools nodejs node-gyp npm ruby nginx \ && pip install --upgrade pip \ && npm install -g less@2.7.1 \ @@ -14,7 +16,13 @@ RUN echo 'APT::Install-Recommends 0;' >> /etc/apt/apt.conf.d/01norecommends \ WORKDIR /app ADD . . -RUN pip install -r requirements.txt +RUN export PATH=$PATH:/usr/bin/ \ + && export PATH=$PATH:/usr/local/bin/ + +RUN pip install --upgrade setuptools \ + && pip install -r requirements.txt \ + && apt-get install -y libmysqlclient-dev \ + && pip install --user MySQL-python RUN cp ./nginx/default.site-example /etc/nginx/sites-available/default \ && cp ./frontend/frontend/settings.py.example ./frontend/frontend/settings.py diff --git a/requirements.txt b/requirements.txt index 0bcb975..34bc9e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,8 @@ Django==1.8.6 lxml==3.8.0 Scrapy==1.4.0 django-pipeline==1.5.4 -mysqlclient==1.3.7 +#mysqlclient==1.3.7 +#MySQL-python==1.2.5 w3lib==1.17.0 feedgenerator==1.8 brotli==0.6.0