diff --git a/.drone.yml b/.drone.yml index eec79f2..b06eabb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,6 @@ steps: POSTGRES_USER: mhackspace USE_DOCKER: yes DJANGO_SETTINGS_MODULE: config.settings.test - BUCKET_URL: http://minio:9000 commands: - cp -n env.example .env - mkdir -p ./cache/packages ./cache/pip @@ -19,6 +18,19 @@ 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 @@ -36,6 +48,8 @@ steps: - docker-compose -fstage.yml down --remove-orphans - docker-compose -fstage.yml up -d + + - name: publish-live pull: True image: appleboy/drone-ssh @@ -61,7 +75,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