diff --git a/graphite/Dockerfile b/graphite/Dockerfile index a41d32f..164a9ad 100644 --- a/graphite/Dockerfile +++ b/graphite/Dockerfile @@ -5,10 +5,11 @@ FROM alpine MAINTAINER EasyPi Software Foundation -ENV PATH=$PATH:/opt/graphite/bin -ENV PYTHONPATH=/opt/graphite/lib:/opt/graphite/webapp +ENV GRAPHITE_VERSION=1.0.1 ENV GRAPHITE_CONF_DIR=/opt/graphite/conf ENV GRAPHITE_STORAGE_DIR=/opt/graphite/storage +ENV PATH=$PATH:/opt/graphite/bin +ENV PYTHONPATH=/opt/graphite/lib:/opt/graphite/webapp WORKDIR /opt/graphite @@ -22,9 +23,10 @@ RUN set -xe \ python \ python-dev \ && curl -sSL https://bootstrap.pypa.io/get-pip.py | python \ - && pip install gunicorn scandir supervisor whisper \ - && pip install carbon --install-option="--install-lib=/opt/graphite/lib" \ - && pip install graphite-web --install-option="--prefix=/opt/graphite" --install-option="--install-lib=/opt/graphite/webapp" \ + && pip install gunicorn scandir supervisor whisper==$GRAPHITE_VERSION \ + && pip install -r https://github.com/graphite-project/graphite-web/raw/$GRAPHITE_VERSION/requirements.txt \ + && pip install carbon==$GRAPHITE_VERSION --install-option="--install-lib=/opt/graphite/lib" \ + && pip install graphite-web==$GRAPHITE_VERSION --install-option="--prefix=/opt/graphite" --install-option="--install-lib=/opt/graphite/webapp" \ && cd conf \ && cp carbon.conf.example carbon.conf \ && cp storage-schemas.conf.example storage-schemas.conf \