Merge pull request #189 from deniszh/DZ-1.1.8-5

Pin pyparsing to 2.4.7

Dockerfile

@@ -102,12 +102,14 @@ RUN . /opt/graphite/bin/activate \
  && $python_binary ./setup.py install $python_extra_flags
 
 # install graphite
+# pin pyparsing to 2.4.7 should be removed in 1.1.9 or later
 ARG graphite_version=${version}
 ARG graphite_repo=https://github.com/graphite-project/graphite-web.git
 RUN . /opt/graphite/bin/activate \
  && git clone -b ${graphite_version} --depth 1 ${graphite_repo} /usr/local/src/graphite-web \
  && cd /usr/local/src/graphite-web \
  && pip3 install -r requirements.txt \
+ && pip3 install --no-deps --force-reinstall pyparsing==2.4.7 \
  && $python_binary ./setup.py install $python_extra_flags
 
 # install statsd

build.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERSION=1.1.8-4
+VERSION=1.1.8-5
 docker build . \
   --build-arg python_binary=python3 --build-arg python_extra_flags="--single-version-externally-managed --root=/" \
   --no-cache --tag graphiteapp/graphite-statsd:$VERSION

build_pypy.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERSION=1.1.8-4
+VERSION=1.1.8-5
 IMAGE=jamiehewland/alpine-pypy:3.6-7.3-alpine3.11
 docker build . \
     --build-arg BASEIMAGE=${IMAGE} --build-arg python_binary=/usr/local/bin/pypy3 --build-arg python_extra_flags="" \