From 85fb38efff38c815537bf5eb41fd89c08baf31c5 Mon Sep 17 00:00:00 2001 From: Oliver Marks Date: Sat, 4 May 2019 13:12:23 +0100 Subject: [PATCH] Turn of cache dir to save memory. --- .drone.yml | 53 ++++++++++++++++++++++++----------- compose/django/Dockerfile | 2 +- compose/django/Dockerfile-dev | 2 +- 3 files changed, 38 insertions(+), 19 deletions(-) diff --git a/.drone.yml b/.drone.yml index eec79f2..1c9a968 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,15 +3,15 @@ name: default steps: - name: tests - image: python:3.6 + image: python:3.6-alpine environment: PYTHONUSERBASE: /drone/src/cache/packages POSTGRES_USER: mhackspace USE_DOCKER: yes DJANGO_SETTINGS_MODULE: config.settings.test - BUCKET_URL: http://minio:9000 commands: - - cp -n env.example .env + - apk add git build-base gcc python3-dev postgresql-dev musl-dev jpeg-dev zlib-dev openjpeg-dev tiff-dev libffi-dev freetype-dev libev-dev lcms2-dev tk-dev tcl-dev harfbuzz-dev fribidi-dev libxslt-dev + - cp env.example .env - mkdir -p ./cache/packages ./cache/pip - pip install --user --cache-dir ./cache/pip -r ./requirements/test.txt - python manage.py compilescss @@ -19,22 +19,41 @@ steps: - pytest -v # - python manage.py test mhackspace --keepdb --verbosity 2 + - name: docker-build + image: plugins/docker + secrets: + - source: DOCKER_USER + target: username + - source: DOCKER_PASS + target: password + settings: + repo: mhackspace-python + dockerfile: ./compose/django/Dockerfile + tags: + - latest + - name: publish-stage pull: True image: appleboy/drone-ssh - host: stage.maidstone-hackspace.org.uk - user: root - secrets: [ ssh_key ] - port: 22 - command_timeout: 480 - script: - - cd /var/www/maidstone-hackspace-website - - git pull - - docker-compose -fstage.yml build - - docker-compose -fstage.yml run --rm django python manage.py compilescss - - docker-compose -fstage.yml run --rm django python manage.py collectstatic - - docker-compose -fstage.yml down --remove-orphans - - docker-compose -fstage.yml up -d + settings: + host: stage.maidstone-hackspace.org.uk + username: + from_secret: ssh_user + key: + from_secret: ssh_key + port: 22 + duration: 4m + + command_timeout: 480 + script: + - cd /var/www/maidstone-hackspace-website + - git pull + - docker-compose -fstage.yml build + - docker-compose -fstage.yml run --rm django python manage.py compilescss + - docker-compose -fstage.yml run --rm django python manage.py collectstatic + - docker-compose -fstage.yml down --remove-orphans + - docker-compose -fstage.yml up -d + - echo 'Finished deploy' - name: publish-live pull: True @@ -61,7 +80,7 @@ services: - npm --version - npm install - - name: minio + - name: bucket image: minio/minio environment: MINIO_ACCESS_KEY: AKIAIOSFODNN7EXAMPLE diff --git a/compose/django/Dockerfile b/compose/django/Dockerfile index 7bc1c20..1a04132 100644 --- a/compose/django/Dockerfile +++ b/compose/django/Dockerfile @@ -10,7 +10,7 @@ RUN apk add --no-cache git build-base gcc \ COPY ./requirements /requirements -RUN pip install --cache-dir ./cache/pip -r /requirements/local.txt \ +RUN pip install --no-cache-dir -r /requirements/local.txt \ && addgroup -g 1000 -S django \ && adduser -u 1000 -S django -G django diff --git a/compose/django/Dockerfile-dev b/compose/django/Dockerfile-dev index 7bc1c20..1a04132 100644 --- a/compose/django/Dockerfile-dev +++ b/compose/django/Dockerfile-dev @@ -10,7 +10,7 @@ RUN apk add --no-cache git build-base gcc \ COPY ./requirements /requirements -RUN pip install --cache-dir ./cache/pip -r /requirements/local.txt \ +RUN pip install --no-cache-dir -r /requirements/local.txt \ && addgroup -g 1000 -S django \ && adduser -u 1000 -S django -G django