From dd28cbe37344fcd164d76956690a2a4f263031a8 Mon Sep 17 00:00:00 2001 From: Oliver Marks Date: Wed, 21 Sep 2016 22:32:12 +0100 Subject: [PATCH] updated drone config --- .drone.yml | 6 ++---- Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7ad473a..a19f198 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,13 +1,11 @@ build: - base: website image: olymk2/mhackspace pull: true commands: - cd website - - sleep 20 - - cat /usr/lib/python3.5/site-packages/scaffold/__main__.py + - sleep 15 - python3 -m "scaffold" - - nose2-3 + - nose2-3.5 compose: diff --git a/Dockerfile b/Dockerfile index fce0d4c..bbd0ec1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,9 @@ ENV SITE_FOLDER /etc/sites/mysite/ RUN apk add --update --no-cache libssl1.0 libxml2 libxslt ca-certificates RUN apk add --update --no-cache py-psycopg2 py-lxml py-flask py-pillow py-openssl py-cffi -RUN apk add --update --no-cache build-base make git bzr python3-dev libffi-dev openssl-dev libxml2-dev libxslt-dev && \ +RUN apk add --update --no-cache build-base make git bzr python3-dev libffi-dev openssl-dev libxml2-dev libxslt-dev jpeg-dev zlib-dev && \ pip3 install lxml && \ - pip3 install --no-cache-dir lxml dateutils requests requests-oauthlib mailer gocardless paypalrestsdk pytz nose2 oauthlib flask flask-login pymysql misaka && \ + pip3 install --no-cache-dir lxml dateutils requests requests-oauthlib mailer gocardless paypalrestsdk pytz nose2 oauthlib flask flask-login pymysql misaka slimit cssmin pillow && \ pip3 install --upgrade git+git://github.com/olymk2/scaffold.git@master && \ #pip3 install --upgrade --no-cache-dir bzr+lp:scaffold/trunk#egg=scaffold && \ apk del build-base make git bzr python3-dev libffi-dev openssl-dev libxml2-dev libxslt-dev