Permalink
Browse files
Merge branch 'master' into feature/dpp-runner
- Loading branch information...
Showing
with
78 additions
and
6 deletions.
-
+18
−4
.travis.yml
-
+34
−0
Makefile
-
+25
−0
docker-compose.ci.yml
-
+1
−2
docker/startup.sh
|
|
@@ -4,6 +4,9 @@ language: |
|
|
python:
|
|
|
- 3.6
|
|
|
|
|
|
services:
|
|
|
- docker
|
|
|
|
|
|
addons:
|
|
|
postgresql: "9.4"
|
|
|
|
|
|
@@ -13,25 +16,36 @@ env: |
|
|
- OS_ELASTICSEARCH_ADDRESS=localhost:9200
|
|
|
- OS_API_URL=http://localhost:8000
|
|
|
- OS_CONDUCTOR_URL=http://localhost:8000
|
|
|
# DOCKER_USERNAME
|
|
|
- secure: XKtk/mVKMBmyLhF+P9thIcP7stsPPG2Xd7JATB1ey73s1gIBPh2c9SqTeQXNjZv0adumoRpxCQPZRpzqqiynG24d0IIiK5KGCj/Yo+8v6+CkuFo0l+t+pmocR+z7iQIqpTP7SjdJjcpwBCY1yBCTveC10mjPIFtkstVtrF/0pnwGkXgYQOOiNX/kOrx8M66webirr7rICA0CGH+sWVJu0yAvtqZauVp1p1pBC8fd+yJDisxFZhzEnmUJ7nshAalzecR82CF9A6WjEnwjDDVuT1myERZCb1sQ8LODLVgGJ3jf6EWgHz1HO82Uwdz3ri4ps8z40/EWpdtrkGX7afN8SlPBnhybLu00ecXBWEDDaben+8wWVYVgAlY4bRqnIq5jAU99gS81NpmSh7linFPqp0ZM6xELWbpPuYY5u510iZeHUkXcNxDZaJdYOCZ8Z0u4KyxJb44wZ/ODVx80JoRmiYdkDKOIDxLLVVOsqRWulBETtsK3UEm8nsI4WjTj0ifdUUoZNP4UslDljFTniNe/LArlj8GyL8w4ZrORtVBREvSqIYx7aNN3yW9kV7bibI7+jVNXqHJ3QQBlUnyfK/SUQJ0oiqxz4R0jQijgIqJlrXCI1O4zYy87pU1ClNUPuSnxGsZGyczqLQIHAC8UXeARFTZ5w6Exx/5tIZ6KQA+jikg=
|
|
|
# DOCKER_PASSWORD
|
|
|
- secure: EbAK+OB3kSgDdPysADnzxaJLEUyYLvJzRGXTtj4WHHX6CRV0id8aA8za5cXLGHb8YOMCLagldWJUM9lu0F2xWZ3Hx0DyEwpriA0n8oxJN0Pq+Cp3N8HbN4Wz8v3HCqj41zZdfXRBvDXxqPnbwb0A7QO0nqWncXDNkyRYin60MzXkEQEjzUQDDwKDZjAXQvN8olWgu36XNuug1+XxVq1rOsmGgBIhsS4jiUq2WouviYs6E5e3Kxnmm4rRWf5li5Y7XXmrJXiloBlKDoEx4Qplbai5bgbCrBXMAe1vyL0P3YeumgdP2mXLB+hWMHuNLJIviO9PTvm8WaJ+UTwjMzF07wDXkK6/GlNc7KMkpk2Z28K+TTw9HOESipo9gCTCwbQbFmgHIT3jJCyZ7xPFiNJZucfjU1paaPYde+vGgZKAsyLHnQzrdcaDh8rIcjjp59IaI7jkRg8bJlGVq4t96aKwwYX6mx4EHot/w6MxnhwuK6iflc5WeLjc87tkC4baWe6JDe5lzCL69k/Uln322vyx+OR50A0nYzvPs2mE97Zu+gCE18w5wMAmi9LVwQ87wLi4i4zGMPb9AVmNkzxTaw5yL9KYVZojtBELkwycdcuM1vhno+HTatfORJA+VpWI4WOHojYpc+w9msmnKV2UdFfDPuPq1Pin2lpkEvcoiPEKn5E=
|
|
|
|
|
|
before_install:
|
|
|
- sudo rm -f /etc/boto.cfg
|
|
|
- curl -O https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.5.2.deb && sudo dpkg -i --force-confnew elasticsearch-1.5.2.deb && sudo service elasticsearch restart
|
|
|
|
|
|
install:
|
|
|
# Will build local Dockerfile as part of ci-run (docker-compose up)
|
|
|
- make ci-run
|
|
|
- pip install --upgrade -r requirements.dev.txt
|
|
|
|
|
|
before_script:
|
|
|
- sleep 30
|
|
|
- curl localhost:9200
|
|
|
|
|
|
script:
|
|
|
- make ci-test
|
|
|
- pylama conductor
|
|
|
- nosetests tests -sv --with-coverage --cover-package conductor
|
|
|
|
|
|
after_success:
|
|
|
- coveralls
|
|
|
|
|
|
notifications:
|
|
|
slack:
|
|
|
secure: fgbAbXOyBQ2XuXyLez2FBGxL2IdYr/ELMG5qAgMVeMyq1auAc6VonVRhRpHGCSYfuCr6kV31k0B3EaRz7Ps84ZlWspFqoDKaJ/D2XGdtnr/pYCx21aaDSVtJ5A6LzCbFwVItTdeabNbDEu1z17lWsct4sITCoJmEFQHKnXvkG9NVqBvCPQrddzUnw3mCxYMo9VuhNF34jo8lt37HQ8/Rvo+vPXfbdgfLbu6u3WfA+R1pdSUdWggc4kXNL+pTpM3c4V0PBJ2gUtzHh3rezyWEbmEcNmK3BAZU1sCjMFf9dBris2dW9xrj5gQfD5zVLHv3KKCKzNkaq23yswZFAkQtmqC08WE/RTReS78KoTM261Rl9yIFkGb34IpjOSpOi05Q4YnNFVWghRel8kAO1IUyCfBXoBHez3OSRks2MWjtsztdVABvw4VvaTOs1gs6h4yf3w6teTbFaytdpL7RsigCQnqCV6oDgeHdKehq19+hL3YQV9CLriWZtoOIKV+ITb4xLx0lGKHlaZkQxEpTwLRPVnz3H+JunojBXcP4XUaSlTf/ss1p5jaeSV5+9Dk9yFoRUabffrRaf4a5EmC8XY++wxPHQ1cqSZF3XZYHfuA1K58afJZkaOs1g2DGNc2Sw6OXgpR6hfgUw9zU989eW5f2tGeQW7SMy4vNpnQfcWrgT98=
|
|
|
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then make ci-push-tag TAG="${TRAVIS_PULL_REQUEST_BRANCH////_}"; fi'
|
|
|
|
|
|
deploy:
|
|
|
# deploy master to latest tag
|
|
|
- provider: script
|
|
|
script: make ci-push
|
|
|
on:
|
|
|
branch: master
|
|
|
@@ -0,0 +1,34 @@ |
|
|
.PHONY: ci-build ci-run ci-test ci-remove ci-clean ci-push-tag ci-push-latest ci-login
|
|
|
|
|
|
NAME := os-conductor
|
|
|
ORG := openspending
|
|
|
REPO := ${ORG}/${NAME}
|
|
|
TAG := $(shell git log -1 --pretty=format:"%h")
|
|
|
IMG := ${REPO}:${TAG}
|
|
|
LATEST := ${REPO}:latest
|
|
|
|
|
|
ci-build:
|
|
|
docker build -t ${IMG} -t ${LATEST} .
|
|
|
|
|
|
ci-run:
|
|
|
docker-compose -f docker-compose.ci.yml up -d
|
|
|
|
|
|
ci-test:
|
|
|
docker ps | grep os-conductor
|
|
|
|
|
|
ci-remove:
|
|
|
docker rm -f ${NAME}
|
|
|
|
|
|
ci-clean:
|
|
|
git stash --all
|
|
|
|
|
|
ci-push: ci-clean ci-build ci-login
|
|
|
docker push ${IMG}
|
|
|
docker push ${LATEST}
|
|
|
|
|
|
ci-push-tag: ci-clean ci-login
|
|
|
docker build -t ${REPO}:${TAG} .
|
|
|
docker push ${REPO}:${TAG}
|
|
|
|
|
|
ci-login:
|
|
|
docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}
|
|
|
@@ -0,0 +1,25 @@ |
|
|
version: "3"
|
|
|
|
|
|
services:
|
|
|
|
|
|
os-conductor:
|
|
|
build: .
|
|
|
container_name: os-conductor
|
|
|
environment:
|
|
|
OS_BASE_URL: http://localhost:8000
|
|
|
OS_CONDUCTOR_URL: http://localhost:8000 # used for callbacks
|
|
|
OS_CONDUCTOR_ENGINE: postgresql://postgres@db/postgres
|
|
|
OS_ELASTICSEARCH_ADDRESS: es:9200
|
|
|
OS_API_URL: http://localhost:8000
|
|
|
OS_CHECK_ES_HEALTHY: 'True'
|
|
|
|
|
|
db:
|
|
|
image: 'postgres:10-alpine'
|
|
|
expose:
|
|
|
- 5432
|
|
|
|
|
|
es:
|
|
|
image: 'elasticsearch:1.5'
|
|
|
expose:
|
|
|
- 9200
|
|
|
- 9300
|
|
|
@@ -7,5 +7,4 @@ echo Setting base url to $OS_BASE_URL |
|
|
cat conductor/blueprints/user/lib/lib.js | sed 's,https://openspending.org,'"$OS_BASE_URL"',' > lib.js.tmp &&
|
|
|
mv -f lib.js.tmp conductor/blueprints/user/lib/lib.js
|
|
|
|
|
|
|
|
|
gunicorn -w 1 conductor.server:app -b 0.0.0.0:8000
|
|
|
gunicorn -w 1 conductor.server:app -b 0.0.0.0:8000 "$@"
|
0 comments on commit
f790285