Skip to content

Commit

Permalink
Further improvements
Browse files Browse the repository at this point in the history
* updated based on reiew comments from @kkopachev
  - adding a comment on pinning to pip 9.0.3
  - updating Pillow-SIMD to latest supported version 4.3.0.post0
  - updating docker-entrypoint to use `python -m thumbor/server`
    to avoid thumbor not finding Pillow
    see uploadcare/pillow-simd#17
* removed unused thumbor-multiprocess-simd
  • Loading branch information
Yoav committed May 18, 2018
1 parent 7b0c48b commit d374e37
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
7 changes: 0 additions & 7 deletions thumbor-multiprocess-simd/Dockerfile

This file was deleted.

4 changes: 3 additions & 1 deletion thumbor/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ ENV WORKON_HOME /usr/src/app
WORKDIR /usr/src/app

COPY requirements.txt /usr/src/app/requirements.txt
# pinning to 9.0.3 because of tornado-botocore.
# See https://github.com/nanvel/tornado-botocore/pull/14
RUN pip install -U pip==9.0.3
RUN pip install --trusted-host None --no-cache-dir \
-r /usr/src/app/requirements.txt
Expand All @@ -32,7 +34,7 @@ RUN \

ARG SIMD_LEVEL
# pinning to 4.3.0 see https://github.com/uploadcare/pillow-simd/issues/17
RUN if [ -n "$SIMD_LEVEL" ]; then pip uninstall -y pillow; CC="cc -m$SIMD_LEVEL" pip install --no-cache-dir -U --force-reinstall git+git://github.com/uploadcare/pillow-simd@d87f2d67ea62d03432f76e33d428e0b07768c94a#egg=Pillow==4.3.0; fi
RUN if [ -n "$SIMD_LEVEL" ]; then pip uninstall -y pillow; CC="cc -m$SIMD_LEVEL" pip install --no-cache-dir -U --force-reinstall Pillow-SIMD==4.3.0.post0; fi

COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"]
Expand Down
2 changes: 1 addition & 1 deletion thumbor/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if [ -z ${THUMBOR_PORT+x} ]; then
fi

if [ "$1" = 'thumbor' ]; then
exec thumbor --port=$THUMBOR_PORT --conf=/usr/src/app/thumbor.conf $LOG_PARAMETER
exec python -m thumbor/server --port=$THUMBOR_PORT --conf=/usr/src/app/thumbor.conf $LOG_PARAMETER
fi

exec "$@"
3 changes: 1 addition & 2 deletions thumbor/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ pyremotecv==0.5.0
remotecv==2.2.1
opencv-engine==1.0.1
thumbor==6.4.2
# see https://github.com/nanvel/tornado-botocore/pull/14
git+git://github.com/Tenzer/tornado-botocore.git@pip-10-installation#egg=tornado-botocore
tornado-botocore==1.3.1
tc-aws==6.2.7
tc-core==0.4.0
tc-shortener==0.2.2
Expand Down

0 comments on commit d374e37

Please sign in to comment.