Skip to content

Commit 63f62d0

Browse files
committed
yagajs#21 use only python3-proj - remove PyPi proj
1 parent f1aa470 commit 63f62d0

File tree

3 files changed

+37
-4
lines changed

3 files changed

+37
-4
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ jobs:
3131
username: ${{ secrets.DOCKER_USERNAME }}
3232
password: ${{ secrets.DOCKER_PASSWORD }}
3333
repository: justb4/mapproxy
34-
tags: latest,2.0.2-1
34+
tags: latest,2.0.2-2
3535
tag_with_ref: false
3636
tag_with_sha: false

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ ENV MAPPROXY_PROCESSES="4" \
3939
MAPPROXY_THREADS="2" \
4040
UWSGI_EXTRA_OPTIONS="" \
4141
DEBIAN_FRONTEND="noninteractive" \
42+
PROJ_DATA="/usr/share/proj" \
43+
PYTHONPATH="/usr/lib/python3/dist-packages" \
4244
DEB_BUILD_DEPS="build-essential libpcre2-dev" \
4345
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}" \
44-
PIP_PACKAGES="uwsgi pyproj requests geojson watchdog MapProxy==${MAPPROXY_VERSION} ${ADD_PIP_PACKAGES}"
46+
PIP_PACKAGES="uwsgi requests geojson watchdog MapProxy==${MAPPROXY_VERSION} ${ADD_PIP_PACKAGES}"
4547

4648
RUN set -x \
4749
&& apt update \
@@ -52,9 +54,10 @@ RUN set -x \
5254
&& pip3 install ${PIP_PACKAGES} ${ADD_PIP_PACKAGES} \
5355
&& mkdir -p /docker-entrypoint-initmapproxy.d \
5456
&& pip3 uninstall --yes wheel \
57+
&& pip3 cache purge \
5558
&& ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime \
56-
&& apt-get remove --purge ${DEB_BUILD_DEPS} -y \
57-
&& apt-get -y --purge autoremove \
59+
&& apt-get remove --yes --purge ${DEB_BUILD_DEPS} \
60+
&& apt-get --yes --purge autoremove \
5861
&& apt-get clean \
5962
&& rm -rf /var/lib/apt/lists/*
6063

README.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,36 @@ docker exec -it mapproxy mapproxy-seed -f /mapproxy/mapproxy.yaml -s /mapproxy/s
5858

5959
```
6060

61+
## Proj Version Info
62+
63+
Proj in `/usr/lib` from `python3-proj` package.
64+
65+
```
66+
$ /usr/bin/pyproj -v
67+
68+
pyproj info:
69+
pyproj: 3.4.1
70+
PROJ: 9.1.1
71+
data dir: /usr/share/proj
72+
user_data_dir: /tmp/proj
73+
PROJ DATA (recommended version): 1.12
74+
PROJ Database: 1.2
75+
EPSG Database: v10.076 [2022-08-31]
76+
ESRI Database: ArcGIS Pro 3.0 [2022-07-09]
77+
IGNF Database: 3.1.0 [2019-05-24]
78+
79+
System:
80+
python: 3.11.2 (main, Mar 13 2023, 12:18:29) [GCC 12.2.0]
81+
executable: /usr/bin/python3
82+
machine: Linux-6.6.22-linuxkit-aarch64-with-glibc2.36
83+
84+
Python deps:
85+
certifi: 2022.9.24
86+
Cython: None
87+
setuptools: None
88+
pip: None
89+
90+
```
6191
## Enhance the image
6292

6393
You can put a `mapproxy.yaml` into the `/docker-entrypoint-initmapproxy.d` folder on the image. On startup this will be

0 commit comments

Comments
 (0)