From 19350e0fc57967d5bbdf1573a1a5998a1f638360 Mon Sep 17 00:00:00 2001 From: Edu Herraiz Aparicio Date: Thu, 19 May 2016 18:57:37 +0200 Subject: [PATCH] More tests in travis --- .travis.yml | 2 ++ docker-compose-travis.yml | 24 +++++++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5a5ee806..897b0a19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,8 @@ script: - docker-compose -f docker-compose-travis.yml up -d - docker-compose -f docker-compose-travis.yml ps - wget http://localhost:8001/unsafe/200x100/www.apsl.net/static/apslweb/img/content/slider/rs-slider4-img15.png +- wget http://localhost:8002/unsafe/200x100/www.apsl.net/static/apslweb/img/content/slider/rs-slider4-img15.png +- wget http://localhost:8003/unsafe/200x100/www.apsl.net/static/apslweb/img/content/slider/rs-slider4-img15.png notifications: email: - gshark@gmail.com diff --git a/docker-compose-travis.yml b/docker-compose-travis.yml index db40ec1e..bf606d79 100644 --- a/docker-compose-travis.yml +++ b/docker-compose-travis.yml @@ -22,6 +22,28 @@ services: - "127.0.0.1:8001:8000" # thumbor port networks: - app + thumbor: + image: apsl/thumbor-multiprocess + environment: + - RESULT_STORAGE=thumbor.result_storages.file_storage + - RESULT_STORAGE_STORES_UNSAFE=True + - STORAGE=thumbor.storages.mixed_storage + - DETECTORS=["thumbor.detectors.queued_detector.queued_complete_detector"] + - REDIS_STORAGE_SERVER_HOST=redis + - REDIS_STORAGE_SERVER_PORT=6379 + - REDIS_STORAGE_SERVER_DB=0 + - REDIS_QUEUE_SERVER_HOST=redis + - REDIS_QUEUE_SERVER_PORT=6379 + - REDIS_QUEUE_SERVER_DB=0 + - MIXED_STORAGE_DETECTOR_STORAGE=thumbor.storages.redis_storage + volumes: + - ./data:/data + links: + - redis:redis + ports: + - "127.0.0.1:8002:8000" # thumbor port + networks: + - app nginx: image: apsl/thumbor-nginx links: @@ -29,7 +51,7 @@ services: volumes_from: - thumbor:ro ports: - - "127.0.0.1:8000:80" # thumbor port + - "127.0.0.1:8003:80" # thumbor port hostname: nginx networks: - app