Skip to content

Commit cade472

Browse files
authored
Merge pull request #36 from aarranz/feature/release-v1.3
Add support for the v1.3 branch of WireCloud (and remove support for v1.0)
2 parents 13336cc + 2f54253 commit cade472

25 files changed

Lines changed: 885 additions & 355 deletions

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ env:
1010
- 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=
1111
- secure: Nwuuh9hk3JhmoPDQG5hCt5dOvQnwOQm0SkQsHbE9PHWMZSftysM/dig80qmdoB4JfcB+0OzXFPJwBZC+IMePzjEsGcP4p2BgEnYmDS3TrPcSiPAljqvOiNj/0/K7I74ZgLm4UtnRjM6m1Og4p8+ueOHXJIiOXMmd6O2njwFcrEk9zFOrYyNLCv6OfnOQDG8E9MFuV5uoHGyr4aurjdZNRj+Io6ENbatWBXCeFTh/XuDNDrCyBrB0FkRah2jF8JMi5hU+FQI78ZnXJxGhSabyEZhPRdPEPI2FHFSn3tEiaoRQghksIR9SNfz86HqZ488BBLttBPkl9m9TbXi9ZczjagkMS5mpQ5z2HNb0Jy5brlKVkfZQry/cmIoFZHWvNzUnCM6QzaQbmsinpC9BKdnllpQfRlE/Z4jzfVLeHCvOvJu8xrGj0LsVslJZTO2g2zZkbrH0myfiV3WHIKZW+IbblqtYIN3FlT8UMnK80TJKNqP1FYU4TAg15ZNtxcr9DTi4ybLm7+c4s+Blb3UNDzhP2IfUSLnLSs/5mPhXsg+CQXAYX6ZES50XH5HCLDPUsodfI1uVEyisOKYGyFh1/ggpXJagGCAc1b9DIAriYs347fZc1OrplUtzDFQmxEpW5kGlnC3vdfALYOTejUZX2OLWLJ1rfRhfcwoWOXc++T8lqvY=
1212
matrix:
13-
- VERSION=1.0-composable
1413
- VERSION=1.1-composable
1514
- VERSION=1.2
15+
- VERSION=1.3
1616
- VERSION=dev
1717
- VERSION=latest
1818

@@ -23,7 +23,7 @@ before_script:
2323
script:
2424
- set -e
2525
- docker build -t fiware/wirecloud:${VERSION} .
26-
- test "${VERSION}" = "latest" && sed -ri "s|fiware/wirecloud:1.2|fiware/wirecloud:latest|g" docker-compose*.yml || true
26+
- test "${VERSION}" = "latest" && sed -ri "s|fiware/wirecloud:1.3|fiware/wirecloud:latest|g" docker-compose*.yml || true
2727
# We need to run this using sudo to be able to remove some files created by
2828
# docker
2929
- sudo /home/travis/virtualenv/python3.6/bin/python tests.py

1.0-composable/Dockerfile

Lines changed: 0 additions & 47 deletions
This file was deleted.

1.0-composable/apache-config.conf

Lines changed: 0 additions & 41 deletions
This file was deleted.

1.0-composable/docker-compose.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

1.0-composable/docker-entrypoint.sh

Lines changed: 0 additions & 67 deletions
This file was deleted.

1.0-composable/manage.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

1.0-composable/tests.py

Lines changed: 0 additions & 70 deletions
This file was deleted.

1.0/Dockerfile

Lines changed: 0 additions & 37 deletions
This file was deleted.

1.0/apache-config.conf

Lines changed: 0 additions & 41 deletions
This file was deleted.

1.0/docker-entrypoint.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)