Merge pull request #186 from deniszh/DZ-1.1.8-3

Alpine 3.15, Django 2.2.26, python-ldap build fix

Dockerfile

@@ -1,4 +1,4 @@
-ARG BASEIMAGE=alpine:3.14.2
+ARG BASEIMAGE=alpine:3.15
 FROM $BASEIMAGE as base
 LABEL maintainer="Denys Zhdanov <[email protected]>"
 
@@ -64,9 +64,10 @@ RUN true \
  && pip install virtualenv==16.7.10 \
  && virtualenv -p $python_binary /opt/graphite \
  && . /opt/graphite/bin/activate \
+ && echo 'INPUT ( libldap.so )' > /usr/lib/libldap_r.so \
  && pip install \
       cairocffi==1.1.0 \
-      django==2.2.24 \
+      django==2.2.26 \
       django-statsd-mozilla \
       fadvise \
       gunicorn==20.1.0 \

build.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-VERSION=1.1.8-2
+VERSION=1.1.8-3
 docker build . --build-arg python_binary=python3 --no-cache --tag graphiteapp/graphite-statsd:$VERSION

build_pypy.sh

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