Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/auto_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: push

jobs:
server_tests:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

services:
postgres:
Expand All @@ -30,8 +30,8 @@ jobs:
run: |
cd server
sudo apt-get -y install libsqlite3-mod-spatialite
pip3 install pipenv==2024.0.1
pipenv install --dev --verbose
pip install pipenv==2026.0.3
pipenv install --dev --verbose --python 3.12

- name: Run tests
run: |
Expand Down
14 changes: 7 additions & 7 deletions server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:jammy-20240627.1
FROM ubuntu:noble-20251013
MAINTAINER Martin Varga "martin.varga@lutraconsulting.co.uk"

# this is to do choice of timezone upfront, because when "tzdata" package gets installed,
Expand All @@ -19,10 +19,6 @@ RUN apt-get update -y && \
gcc build-essential binutils cmake extra-cmake-modules libsqlite3-mod-spatialite libmagic1 && \
rm -rf /var/lib/apt/lists/*


# needed for geodiff
RUN pip3 install --upgrade pip==24.0

# create mergin user to run container with
RUN groupadd -r mergin -g 901
RUN groupadd -r mergin-family -g 999
Expand All @@ -32,12 +28,16 @@ RUN useradd -u 901 -r --home-dir /app --create-home -g mergin -G mergin-family -
COPY . /app
WORKDIR /app

RUN pip3 install pipenv==2024.0.1
# keep installing to system packages
ENV PIP_BREAK_SYSTEM_PACKAGES=1
ENV PIP_IGNORE_INSTALLED=1

RUN pip install pipenv==2026.0.3
# for locale check this http://click.pocoo.org/5/python3/
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8

RUN pipenv install --system --deploy --verbose
RUN pipenv install --system --deploy --verbose --python 3.12

USER mergin

Expand Down
2 changes: 1 addition & 1 deletion server/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ pre-commit = "==4.1.0"
atomicwrites = "==1.4.0"

[requires]
python_version = "3.10"
python_version = "3.12"
Loading
Loading