Skip to content

Commit

Permalink
Merge pull request #728 from Amsterdam/improvement/129985-update-post…
Browse files Browse the repository at this point in the history
…gress-docker-image

129985 change database image to PostGIS
  • Loading branch information
remyvdwereld authored Nov 13, 2024
2 parents 8ef83a1 + 5af3309 commit 4d311e3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.x
python-version: '3.10'
- name: Linting
run: bash cleanup.sh
- name: Create Docker Looplijsten Backend network
Expand All @@ -22,6 +22,7 @@ jobs:
run: docker network create top_and_zaak_backend_bridge
- name: Build Docker image
run: docker compose -f docker-compose.local.yml up -d
- run: sleep 30
- name: Run Tests
run: docker compose -f docker-compose.local.yml exec -T api python manage.py test

Expand Down
10 changes: 5 additions & 5 deletions app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ WORKDIR /app
COPY requirements.txt /app/

RUN apt-get update && apt-get install -y \
gdal-bin \
libgdal-dev \
graphviz \
graphviz-dev \
postgresql-client
gdal-bin \
libgdal-dev \
graphviz \
graphviz-dev \
postgresql-client


RUN pip install --upgrade pip
Expand Down
3 changes: 2 additions & 1 deletion app/apps/itinerary/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ def clear_team_members(self):

def get_center(self, auth_header=None):
"""
Returns the center coordinates of the itinerary
Returns the center coordinates of the current itinerary.
If there's no intinerary, it returns the city center.
"""
cases = self.get_cases()

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
database:
networks:
- top_network
image: amsterdam/postgres12
image: postgis/postgis:14-3.2
shm_size: "512m"
ports:
- "5409:5432"
Expand Down

0 comments on commit 4d311e3

Please sign in to comment.