diff --git a/.gitignore b/.gitignore index e659ef0..0a854dc 100644 --- a/.gitignore +++ b/.gitignore @@ -66,5 +66,4 @@ www/ !.elasticbeanstalk/*.cfg.yml !.elasticbeanstalk/*.global.yml -app.env node_modules \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b045ef8..ca5a265 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,25 @@ services: language: python python: - 3.6 -install: - - pip install -r requirements.txt - - npm install -script: - - echo "CI test" + +before_install: + - sudo rm /usr/local/bin/docker-compose + - curl -L https://github.com/docker/compose/releases/download/1.18.0/docker-compose-`uname -s`-`uname -m` > docker-compose + - chmod +x docker-compose + - sudo mv docker-compose /usr/local/bin + +jobs: + include: + - stage: "build" + script: + - sh ./.makefile/start.sh + - stage: "test" + script: + - make start + - python manage.py test users + - stage: "deploy" + if: branch = master + script: + - echo deployment after_success: - echo "Success" \ No newline at end of file diff --git a/app.env b/app.env new file mode 100644 index 0000000..571dccd --- /dev/null +++ b/app.env @@ -0,0 +1,5 @@ +SECRET_KEY=secret +DOCKER_ENVIRONMENT=True + +REDIS_HOST=redis +REDIS_PORT=6379 \ No newline at end of file diff --git a/req.txt b/req.txt index e69de29..9118d6c 100644 --- a/req.txt +++ b/req.txt @@ -0,0 +1 @@ +asdasd \ No newline at end of file