Skip to content
This repository has been archived by the owner on Jul 29, 2022. It is now read-only.

Commit

Permalink
Clean dependencies, opencv fix and tested remotecv scale up
Browse files Browse the repository at this point in the history
  • Loading branch information
psyduck787 committed Oct 14, 2015
1 parent b0824fc commit 53f7c4c
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 63 deletions.
8 changes: 7 additions & 1 deletion TODOs
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,10 @@ Redis
ab -n 1000 -c 5 http://localhost:8000/unsafe/600x500/static.goal.com/749100/749122_heroa.jpg
Without result storage , without nginx: 32
With result storage , without nginx: 748
With result storage , with nginx: 5237
With result storage , with nginx: 5237


python
python-dev
python-distribute
python-pip
10 changes: 10 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ thumbor:
environment:
RESULT_STORAGE: thumbor.result_storages.file_storage
RESULT_STORAGE_STORES_UNSAFE: True
DETECTORS: ['thumbor.detectors.queued_detector.queued_complete_detector',]
STORAGE: thumbor.storages.mixed_storage
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
- logs:/logs
Expand All @@ -26,5 +35,6 @@ remotecv:
environment:
REDIS_HOST: redis
REDIS_PORT: 6379
REDIS_DATABASE: 0
redis:
image: redis:latest
16 changes: 0 additions & 16 deletions remotecv-multiprocess/Dockerfile

This file was deleted.

8 changes: 0 additions & 8 deletions remotecv-multiprocess/conf/circus.ini.tpl

This file was deleted.

8 changes: 0 additions & 8 deletions remotecv-multiprocess/conf/remotecv.ini.tpl

This file was deleted.

13 changes: 0 additions & 13 deletions remotecv-multiprocess/docker-entrypoint.sh

This file was deleted.

3 changes: 0 additions & 3 deletions remotecv-multiprocess/requirements.txt

This file was deleted.

4 changes: 4 additions & 0 deletions remotecv/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ WORKDIR /usr/src/app
COPY requirements.txt /usr/src/app/requirements.txt
RUN pip install --no-cache-dir -r /usr/src/app/requirements.txt

RUN \
ln /usr/lib/python2.7/dist-packages/cv2.x86_64-linux-gnu.so /usr/local/lib/python2.7/cv2.so && \
ln /usr/lib/python2.7/dist-packages/cv.py /usr/local/lib/python2.7/cv.py

COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["remotecv"]
2 changes: 1 addition & 1 deletion remotecv/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ pyremotecv==0.5.0
remotecv==1.0.2
opencv-engine==1.0.1
redis==2.4.12
thumbor==5.1.0
thumbor==5.2.0
git+https://github.com/APSL/thumbor_aws.git
7 changes: 1 addition & 6 deletions remotecv/system-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
python-numpy
python-opencv
git
mercurial
curl
build-essential
libcurl4-openssl-dev
python
python-dev
python-distribute
python-pip
libdc1394-22
libdc1394-22-dev
libjpeg-dev
libpng12-dev
libtiff5-dev
libjasper-dev
libjpeg-turbo-progs
libjpeg-turbo-progs
2 changes: 1 addition & 1 deletion thumbor/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ pyremotecv==0.5.0
remotecv==1.0.2
opencv-engine==1.0.1
redis==2.4.12
thumbor==5.1.0
thumbor==5.2.0
git+https://github.com/APSL/thumbor_aws.git
7 changes: 1 addition & 6 deletions thumbor/system-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
python-numpy
python-opencv
git
mercurial
curl
build-essential
libcurl4-openssl-dev
python
python-dev
python-distribute
python-pip
libdc1394-22
libdc1394-22-dev
libjpeg-dev
libpng12-dev
libtiff5-dev
libjasper-dev
libjpeg-turbo-progs
libjpeg-turbo-progs
8 changes: 8 additions & 0 deletions urls.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
http://localhost:8000/unsafe/300x500/smart/2.bp.blogspot.com/-2kP_CmwYQv0/Tb7RyZ1urkI/AAAAAAAAACk/z3I-wdrxMLU/s1600/Jaime-Lannister-game-of-thrones-20317262-1280-720.jpg
http://localhost:8000/unsafe/300x500/smart/www.gameofthroneswallpaper.com/images/wmwallpapers/Lord-Eddard-Stark-Game-of-Thrones-1.jpeg
http://localhost:8000/unsafe/300x500/smart/www.formulatv.com/fotos/a/163000/163808/h6hkawf6aaiovh4vhd4decd70791e35_khal-drogo_m.jpg
http://localhost:8000/unsafe/300x500/smart/www.kissmybit.com/wp-content/uploads/2013/03/arya-stark-game-of-thrones-20831811-500-281.jpg
http://localhost:8000/unsafe/300x500/smart/3.bp.blogspot.com/-Lg7OP9g5G5g/T9eeRFZ5fMI/AAAAAAAAG0k/_Ufykb_JYwY/s1600/white+walker_game+of+thrones_season+3.jpg
http://localhost:8000/unsafe/300x500/smart/www.cadizturismo.com/media/fotos/image_62090.jpeg
http://localhost:8000/unsafe/300x500/smart/upload.wikimedia.org/wikipedia/commons/6/62/Playa_Bavaro.JPG
http://localhost:8000/unsafe/300x500/smart/www.cadizturismo.com/media/fotos/image_62087.jpeg

0 comments on commit 53f7c4c

Please sign in to comment.