Skip to content

Commit 01dd32f

Browse files
committed
Ensure Postgis present on Docker, CI, devcontainer
1 parent a889f3e commit 01dd32f

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

.devcontainer/compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ services:
3737
restart: unless-stopped
3838

3939
postgres:
40-
image: postgres:16.1
40+
image: postgis/postgis:16-3.5
4141
restart: unless-stopped
4242
networks:
4343
- default

.github/workflows/lint.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ jobs:
101101
cache: yarn
102102
- name: Install node modules
103103
run: bundle exec bin/yarn install
104+
- name: Install packages
105+
run: |
106+
sudo apt-get -yqq update
107+
sudo apt-get -yqq install postgis
104108
- name: Setup database
105109
run: |
106110
sudo systemctl start postgresql

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install packages
3434
run: |
3535
sudo apt-get -yqq update
36-
sudo apt-get -yqq install memcached libvips-dev xvfb mesa-utils libgl1-mesa-dri
36+
sudo apt-get -yqq install memcached libvips-dev xvfb mesa-utils libgl1-mesa-dri postgis
3737
- name: Create database
3838
run: |
3939
sudo systemctl start postgresql

docker/postgres/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:14
1+
FROM postgis/postgis:14-3.5
22

33
# Add db init script to install OSM-specific Postgres user.
44
ADD docker/postgres/openstreetmap-postgres-init.sh /docker-entrypoint-initdb.d/

0 commit comments

Comments
 (0)