diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 51a7d07..7885c51 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,6 +31,6 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} repository: justb4/mapproxy - tags: latest,2.0.2-1 + tags: latest,2.0.2-2 tag_with_ref: false tag_with_sha: false diff --git a/Dockerfile b/Dockerfile index b1e2716..023ec14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,9 +39,11 @@ ENV MAPPROXY_PROCESSES="4" \ MAPPROXY_THREADS="2" \ UWSGI_EXTRA_OPTIONS="" \ DEBIAN_FRONTEND="noninteractive" \ + PROJ_DATA="/usr/share/proj" \ + PYTHONPATH="/usr/lib/python3/dist-packages" \ DEB_BUILD_DEPS="build-essential libpcre2-dev" \ DEB_PACKAGES="python3-pil python3-yaml python3-pyproj libgeos-dev python3-lxml libgdal-dev python3-shapely libxml2-dev libxslt-dev uwsgi-plugin-python3 ${ADD_DEB_PACKAGES}" \ - PIP_PACKAGES="uwsgi pyproj requests geojson watchdog MapProxy==${MAPPROXY_VERSION} ${ADD_PIP_PACKAGES}" + PIP_PACKAGES="uwsgi requests geojson watchdog MapProxy==${MAPPROXY_VERSION} ${ADD_PIP_PACKAGES}" RUN set -x \ && apt update \ @@ -52,9 +54,10 @@ RUN set -x \ && pip3 install ${PIP_PACKAGES} ${ADD_PIP_PACKAGES} \ && mkdir -p /docker-entrypoint-initmapproxy.d \ && pip3 uninstall --yes wheel \ + && pip3 cache purge \ && ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime \ - && apt-get remove --purge ${DEB_BUILD_DEPS} -y \ - && apt-get -y --purge autoremove \ + && apt-get remove --yes --purge ${DEB_BUILD_DEPS} \ + && apt-get --yes --purge autoremove \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/README.md b/README.md index 50b211d..314a352 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,36 @@ docker exec -it mapproxy mapproxy-seed -f /mapproxy/mapproxy.yaml -s /mapproxy/s ``` +## Proj Version Info + +Proj in `/usr/lib` from `python3-proj` package. + +``` +$ /usr/bin/pyproj -v + +pyproj info: + pyproj: 3.4.1 + PROJ: 9.1.1 + data dir: /usr/share/proj +user_data_dir: /tmp/proj +PROJ DATA (recommended version): 1.12 +PROJ Database: 1.2 +EPSG Database: v10.076 [2022-08-31] +ESRI Database: ArcGIS Pro 3.0 [2022-07-09] +IGNF Database: 3.1.0 [2019-05-24] + +System: + python: 3.11.2 (main, Mar 13 2023, 12:18:29) [GCC 12.2.0] +executable: /usr/bin/python3 + machine: Linux-6.6.22-linuxkit-aarch64-with-glibc2.36 + +Python deps: + certifi: 2022.9.24 + Cython: None +setuptools: None + pip: None + +``` ## Enhance the image You can put a `mapproxy.yaml` into the `/docker-entrypoint-initmapproxy.d` folder on the image. On startup this will be