Merge pull request #13 from aarranz/feature/release-1.2-preparation

Preparation for releasing WireCloud 1.2.0

Author: aarranz

.gitignore

@@ -0,0 +1 @@
+.DS_Store

.travis.yml

@@ -1,5 +1,6 @@
 language: python
-sudo: false
+python: "3.6"
+sudo: true
 
 services:
     - docker
@@ -9,24 +10,25 @@ env:
         - secure: br4/uA6kM7/aiO9c4/uKrn0PCYHa8NTD/DV98N8K1/YHb5HGbOhIVrV7F7GBKiGOQKIwuD7hZ9fmZeI80iDjIdBfP+rlUt3Ipdd6/X+IwcHu46t9N89Fuw6EK+KApjK3et1BXvqT8GPMjOLX9a2O58fYMMr6OBPQGPDdSNCLnE7PQ1kX79WtXI/YpF3Ip5mDDrOeOOddVpS6+biHBthrdYRK/ZZJDTVt1HmL3Oe9LF8vt9Xw3JdzHnwBTuWg1mI+z0UCD7Nsylls/zxg8uORaMKnDIem9D9oIFWcLFWP9U/rqkIaoDi5XNwVWvMEmBT9D2qRfthm4yGyMFaBTbmE/JPG1bVuYgZYnz9DXRacRW978NudAYE7VOHjom89cW5sEt2525RbXtTgS53hZP+0PKwouXGvZPh+S45uSzKAuiCuXAuwRMLC9P77KKy+2ouhD0Czbz6BoBUtF8/KkTCQyxfo4h96+l3aVaCfD10LA3dRPJI2lWozvi57PmFvHVfKwN4B+aNunFvfuQhVdVZbudnKlFO0ew4AFaIZlKc35QeG8Yi7aymOeg+d2GsCpYG9blvMgF4+2K1Zt1OGbaO+cOhY3rI5pE6PRKQKfcpUaOLXhozLVBCMNJmXmbevuTwV6JK9UYnNRW7oVNfAbnox63PkfQIVC8LIJ7i21f/qjAU=
         - secure: Nwuuh9hk3JhmoPDQG5hCt5dOvQnwOQm0SkQsHbE9PHWMZSftysM/dig80qmdoB4JfcB+0OzXFPJwBZC+IMePzjEsGcP4p2BgEnYmDS3TrPcSiPAljqvOiNj/0/K7I74ZgLm4UtnRjM6m1Og4p8+ueOHXJIiOXMmd6O2njwFcrEk9zFOrYyNLCv6OfnOQDG8E9MFuV5uoHGyr4aurjdZNRj+Io6ENbatWBXCeFTh/XuDNDrCyBrB0FkRah2jF8JMi5hU+FQI78ZnXJxGhSabyEZhPRdPEPI2FHFSn3tEiaoRQghksIR9SNfz86HqZ488BBLttBPkl9m9TbXi9ZczjagkMS5mpQ5z2HNb0Jy5brlKVkfZQry/cmIoFZHWvNzUnCM6QzaQbmsinpC9BKdnllpQfRlE/Z4jzfVLeHCvOvJu8xrGj0LsVslJZTO2g2zZkbrH0myfiV3WHIKZW+IbblqtYIN3FlT8UMnK80TJKNqP1FYU4TAg15ZNtxcr9DTi4ybLm7+c4s+Blb3UNDzhP2IfUSLnLSs/5mPhXsg+CQXAYX6ZES50XH5HCLDPUsodfI1uVEyisOKYGyFh1/ggpXJagGCAc1b9DIAriYs347fZc1OrplUtzDFQmxEpW5kGlnC3vdfALYOTejUZX2OLWLJ1rfRhfcwoWOXc++T8lqvY=
     matrix:
-        - VERSION=0.9-composable
         - VERSION=1.0-composable
         - VERSION=1.1-composable
-        - VERSION=latest-composable
+        - VERSION=1.2
+        - VERSION=dev
+        - VERSION=latest
 
 before_script:
+    - pip install sh requests docker-compose
     - cd ${VERSION}
-    - cp ../hub-docs/docker-compose.yml ../hub-docs/nginx.conf .
-    - sed -i 's/latest-composable/${VERSION}/' docker-compose.yml
 
 script:
     - set -e
     - docker build -t fiware/wirecloud:${VERSION} .
-    - docker-compose up -d
-    - sleep 40
-    - curl -v http://localhost/api/version
+    # We need to run this using sudo to be able to remove some files created by
+    # docker
+    - sudo /home/travis/virtualenv/python3.6/bin/python tests.py
 
 after_success:
+    - set +e
     - test "$TRAVIS_BRANCH" = "master" && test "$TRAVIS_PULL_REQUEST" = "false" && docker login -u $DOCKER_USER -p $DOCKER_PASS && docker push fiware/wirecloud:${VERSION}
 
 branches:

0.9-composable/Dockerfile

@@ -0,0 +1,30 @@
+version: "3.1"
+
+services:
+
+    nginx:
+        restart: always
+        image: nginx:latest
+        ports:
+            - 80:80
+        volumes:
+            - ./nginx.conf:/etc/nginx/nginx.conf:ro
+            - ./static:/var/www/static:ro
+        depends_on:
+            - wirecloud
+
+
+    postgres:
+        restart: always
+        image: postgres:latest
+        volumes:
+            - ./postgres-data:/var/lib/postgresql/data
+
+    wirecloud:
+        restart: always
+        image: fiware/wirecloud:1.0-composable
+        depends_on:
+            - postgres
+        volumes:
+            - ./wirecloud_instance:/opt/wirecloud_instance
+            - ./static:/var/www/static