Skip to content

run ci with docker #1237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
krmax44 wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

run ci with docker #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6881c73
👷 upgrade ci actions
krmax44 Mar 30, 2026
65d9c89
👷 run in container image
krmax44 Mar 30, 2026
1b5108b
🔧 allow setting multiple elasticsearch hosts via env
krmax44 Apr 2, 2026
75d8320
👷 set proper service hosts
krmax44 Apr 2, 2026
9888fa6
🐛 fix elasticsearch dsl config
krmax44 Apr 2, 2026
6ba5a76
proper elasticsearch host
krmax44 Apr 2, 2026
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
27 changes: 14 additions & 13 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,37 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Install pnpm
uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
uses: pnpm/action-setup@v5
- uses: actions/setup-node@v6
with:
node-version: 22
node-version: 24
cache: pnpm
- name: Install dependencies
run: pnpm install
- uses: pre-commit/action@v3.0.1
- uses: j178/prek-action@v1

test:
runs-on: ubuntu-latest
container:
image: ghcr.io/fragdenstaat/fds-base
strategy:
matrix:
python-version: ['3.12', '3.13', '3.14']
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Setup uv
uses: astral-sh/setup-uv@v7
uses: astral-sh/setup-uv@v8.0.0
with:
python-version: ${{ matrix.python-version }}
activate-environment: true
- name: Install pnpm
uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
uses: pnpm/action-setup@v5
- uses: actions/setup-node@v6
with:
node-version: 22
node-version: 24
cache: pnpm
- name: Install system-level dependencies
run: sudo apt-get update && sudo apt-get install libgdal-dev gdal-bin libmagic-dev libmagickwand-dev libpoppler-cpp-dev poppler-utils ghostscript
- name: Install dependencies
run: |
uv sync
Expand All @@ -53,7 +53,8 @@ jobs:
coverage run --branch -m pytest froide/
coverage report --format=markdown >> $GITHUB_STEP_SUMMARY
env:
DATABASE_URL: postgis://postgres:postgres@localhost/froide
DATABASE_URL: postgis://postgres:postgres@postgres/froide
DJANGO_ELASTICSEARCH_HOSTS: http://elasticsearch:9200

services:
postgres:
Expand Down
10 changes: 6 additions & 4 deletions froide/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,10 +481,12 @@ def STATICFILES_DIRS(self):
# ######## Search ###########

ELASTICSEARCH_INDEX_PREFIX = "froide"
ELASTICSEARCH_HOST = values.Value("localhost")
ELASTICSEARCH_DSL = {
"default": {"hosts": "http://%s:9200" % ELASTICSEARCH_HOST},
}
ELASTICSEARCH_HOSTS = values.ListValue(["http://localhost:9200"])

@property
def ELASTICSEARCH_DSL(self):
return {"default": {"hosts": self.ELASTICSEARCH_HOSTS}}

ELASTICSEARCH_DSL_SIGNAL_PROCESSOR = (
"django_elasticsearch_dsl.signals.RealTimeSignalProcessor"
)
Expand Down