Merge branch 'ci_changes' into 'master'

Trying some new things with the gitlab.yml file, also removing pylint from requirements.txt so it is only installed during testing

See merge request ldooks/dragon-bot!1
This commit is contained in:
Luke 2018-06-13 17:57:42 +00:00
commit 935f3b8a23
3 changed files with 11 additions and 12 deletions

View File

@ -2,24 +2,23 @@ image: docker:latest
services:
- docker:dind
before_script:
- apk add --no-cache python3
- pip3 install -r app/requirements.txt
stages:
- test
- linting
- deploy
linting_python:
stage: test
linting:
stage: linting
before_script:
- apk add --no-cache python3
- pip3 install pylint
- pip3 install -r app/requirements.txt
script:
- pylint -E app/*.py
only:
- /.*/
tags:
- docker
build_and_push_container:
before_script:
- apk add --no-cache python3
- pip3 install -r app/requirements.txt
stage: deploy
script:
- docker login -u ldooks -p $DOCKER_PASSWORD

View File

@ -3,6 +3,7 @@ ADD app/requirements.txt /requirements.txt
RUN apk update && \
apk add --no-cache vim docker && \
pip install -U pip && \
pip install pylint && \
pip install -r requirements.txt
ADD app /app

View File

@ -2,7 +2,6 @@ beautifulsoup4
discord.py
docker
gTTS
pylint
pyowm
requests
wikipedia