Merge branch 'cherry-pick-a3e0c26d' into 'release-20.2'

Merge branch 'fix-docker-image-proj' into 'master'

See merge request !3918

.docker/Dockerfile

@@ -22,26 +22,29 @@ RUN apk add --update --no-cache \
     tzdata \
     libmemcached \
     curl \
-   && apk add --no-cache --virtual .build-deps \
-        git \
-        build-base \
-        cyrus-sasl-dev \
-        cython \
-        cython-dev \
-        gcc \
-        libffi-dev \
-        libmemcached-dev \
-        libressl-dev \
-        musl-dev \
-        postgresql-dev \
-        python3-dev \
-        zlib-dev \
-        cmake \
+    proj
+RUN apk add --no-cache --virtual .build-deps \
+    git \
+    build-base \
+    cyrus-sasl-dev \
+    cython \
+    cython-dev \
+    gcc \
+    libffi-dev \
+    libmemcached-dev \
+    libressl-dev \
+    musl-dev \
+    postgresql-dev \
+    python3-dev \
+    zlib-dev \
+    cmake \
+    proj-util \
+    proj-dev \
     && pip3 install --src=/tmp/src --no-cache --trusted-host cdn.getnoc.com --find-links https://cdn.getnoc.com/npkg/ --upgrade -r /opt/noc/requirements/docker.txt \
-    && python ./scripts/deploy/install-packages requirements/web.json \
-    && python ./scripts/deploy/install-packages requirements/card.json \
-    && python ./scripts/deploy/install-packages requirements/bi.json \
-    && find /opt/noc/ -type f -name "*.py" -print0 | xargs -0 python -m py_compile \
+    && python3 ./scripts/deploy/install-packages requirements/web.json \
+    && python3 ./scripts/deploy/install-packages requirements/card.json \
+    && python3 ./scripts/deploy/install-packages requirements/bi.json \
+    && find /opt/noc/ -type f -name "*.py" -print0 | xargs -0 python3 -m py_compile \
     && /usr/bin/cythonize -i speedup/*.pyx \
     && apk del -r .build-deps \
     && adduser -h /opt/noc -s /bin/sh -S -D -H -u 1200 noc \