Skip to content

Commit

Permalink
remove search path note from readme
Browse files Browse the repository at this point in the history
  • Loading branch information
smnorris committed Jan 14, 2024
1 parent b09e79a commit 5ff4b2c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM ghcr.io/osgeo/gdal:ubuntu-small-3.7.0
FROM ghcr.io/osgeo/gdal:ubuntu-small-3.8.0

RUN apt-get update && apt-get --assume-yes upgrade \
&& apt-get -qq install -y --no-install-recommends postgresql-common \
&& apt-get -qq install -y --no-install-recommends yes \
&& apt-get -qq install -y --no-install-recommends gnupg \
&& yes '' | sh /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh \
&& apt-get -qq install -y --no-install-recommends postgresql-client-14 \
&& apt-get -qq install -y --no-install-recommends postgresql-client-16 \
&& apt-get -qq install -y --no-install-recommends make \
&& apt-get -qq install -y --no-install-recommends g++ \
&& apt-get -qq install -y --no-install-recommends git \
Expand All @@ -16,7 +16,6 @@ RUN apt-get update && apt-get --assume-yes upgrade \
&& apt-get -qq install -y --no-install-recommends python3-pip \
&& apt-get -qq install -y --no-install-recommends python3-psycopg2 \
&& pip3 install --upgrade numpy \
&& pip3 install geopandas==0.12.2 \
&& pip3 install bcdata \
&& rm -rf /var/lib/apt/lists/*

Expand Down
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@ See [documentation](https://smnorris.github.io/fwapg/) for setup and usage detai

export DATABASE_URL=postgres://username:password@localhost:5432/fwapg

3. FWA functions are added to the `whse_basemapping` schema - add them to the `SEARCH_PATH` to ensure they are picked up without schema qualification:

psql -c "ALTER DATABASE <database_name> SET search_path TO public,whse_basemapping,usgs,hydrosheds"


4. Get scripts, load and optimize the data:
3. Get scripts, load and optimize the data:

git clone https://github.com/smnorris/fwapg.git
cd fwapg
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3.9"
services:
db:
image: postgis/postgis:14-3.3
image: postgis/postgis:16-3.4
shm_size: 16gb
container_name: fwapg-db
command: postgres -c default_statistics_target=100 -c max_connections=100 -c max_locks_per_transaction=64 -c checkpoint_timeout=30min -c maintenance_work_mem=1GB -c effective_cache_size=16GB -c work_mem=500MB -c max_wal_size=10GB -c wal_buffers=16MB -c shared_buffers=8GB
Expand Down

0 comments on commit 5ff4b2c

Please sign in to comment.