Skip to content

Commit

Permalink
Merge pull request #386 from WISVCH/fix-poetry
Browse files Browse the repository at this point in the history
  • Loading branch information
praseodym authored Feb 20, 2025
2 parents 935b12b + 8a7a2d3 commit 7c663f5
Show file tree
Hide file tree
Showing 5 changed files with 837 additions and 531 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ ENV PYTHONUNBUFFERED 1

RUN pip3 install poetry
RUN poetry config virtualenvs.create false
RUN poetry install
RUN poetry install --with dev
20 changes: 9 additions & 11 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,17 @@ jobs:
with:
python-version: 3.11
- name: Install prerequisites
run: |
sudo apt-get install libpq-dev
sudo apt-get install libssl-dev
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install poetry
poetry config virtualenvs.create false
poetry install
run: sudo apt-get install libpq-dev libssl-dev
- name: Upgrade pip
run: python -m pip install --upgrade pip
- name: Install Poetry
run: python -m pip install poetry
- name: Install dependencies using Poetry
run: poetry install
- name: Run migrations
run: python manage.py migrate
run: poetry run ./manage.py migrate
- name: Run tests
run: python manage.py test
run: poetry run ./manage.py test
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN export DEBIAN_FRONTEND="noninteractive" && \
rm -rf /tmp/* /var/lib/apt/lists/*

RUN poetry config virtualenvs.create false
RUN poetry install --no-root --no-dev
RUN poetry install --no-root
RUN set -a && . ./ci.env && python manage.py collectstatic --noinput --no-post-process

RUN groupadd -r dienst2 --gid=999 && useradd --no-log-init -r -g dienst2 --uid=999 dienst2
Expand Down
Loading

0 comments on commit 7c663f5

Please sign in to comment.