Skip to content

Commit

Permalink
docker: enable PROJ_NETWORK=ON and more cleanup (OSGeo#2822)
Browse files Browse the repository at this point in the history
debian and ubuntu Dockerfiles:
* enable PROJ CDN support for grids (`PROJ_NETWORK=ON`): see https://proj.org/usage/environmentvars.html#envvar-PROJ_NETWORK
* more cleanup added: `apt-get clean all && rm -rf /var/lib/apt/lists/*`

(backport in OSGeo#2823)
  • Loading branch information
neteler authored Feb 14, 2023
1 parent fedef50 commit d864bdb
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 4 deletions.
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ RUN apt-get update && apt-get upgrade -y && \
vim \
wget \
zip \
zlib1g-dev
zlib1g-dev \
&& apt-get clean all && rm -rf /var/lib/apt/lists/*

RUN echo LANG="en_US.UTF-8" > /etc/default/locale
RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen
Expand Down Expand Up @@ -188,6 +189,9 @@ ENV SHELL /bin/bash
ENV LC_ALL "en_US.UTF-8"
ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1

# https://proj.org/usage/environmentvars.html#envvar-PROJ_NETWORK
ENV PROJ_NETWORK=ON

# Create generic GRASS GIS lib name regardless of version number
RUN ln -sf /usr/local/grass83 /usr/local/grass

Expand Down
6 changes: 5 additions & 1 deletion docker/debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ RUN apt-get update && apt-get upgrade -y && \
vim \
wget \
zip \
zlib1g-dev
zlib1g-dev \
&& apt-get clean all && rm -rf /var/lib/apt/lists/*

RUN echo LANG="en_US.UTF-8" > /etc/default/locale
RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen
Expand Down Expand Up @@ -190,6 +191,9 @@ ENV SHELL /bin/bash
ENV LC_ALL "en_US.UTF-8"
ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1

# https://proj.org/usage/environmentvars.html#envvar-PROJ_NETWORK
ENV PROJ_NETWORK=ON

# Create generic GRASS GIS lib name regardless of version number
RUN ln -sf /usr/local/grass83 /usr/local/grass

Expand Down
6 changes: 5 additions & 1 deletion docker/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ RUN apt-get update && apt-get upgrade -y && \
vim \
wget \
zip \
zlib1g-dev
zlib1g-dev \
&& apt-get clean all && rm -rf /var/lib/apt/lists/*

RUN echo LANG="en_US.UTF-8" > /etc/default/locale
RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen
Expand Down Expand Up @@ -188,6 +189,9 @@ ENV SHELL /bin/bash
ENV LC_ALL "en_US.UTF-8"
ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1

# https://proj.org/usage/environmentvars.html#envvar-PROJ_NETWORK
ENV PROJ_NETWORK=ON

# Create generic GRASS GIS lib name regardless of version number
RUN ln -sf /usr/local/grass83 /usr/local/grass

Expand Down
6 changes: 5 additions & 1 deletion docker/ubuntu_wxgui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ RUN apt-get update && apt-get upgrade -y && \
vim \
wget \
zip \
zlib1g-dev
zlib1g-dev \
&& apt-get clean all && rm -rf /var/lib/apt/lists/*

# wxGUI
RUN pip install -U \
Expand Down Expand Up @@ -225,6 +226,9 @@ ENV SHELL /bin/bash
ENV LC_ALL "en_US.UTF-8"
ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1

# https://proj.org/usage/environmentvars.html#envvar-PROJ_NETWORK
ENV PROJ_NETWORK=ON

# Create generic GRASS GIS lib name regardless of version number
RUN ln -sf /usr/local/grass83 /usr/local/grass

Expand Down

0 comments on commit d864bdb

Please sign in to comment.