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
4 changes: 2 additions & 2 deletions .github/workflows/tox.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ on:
jobs:
build:
name: Tox unit tests and linting
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
matrix:
python-version: ['3.10']
python-version: ['3.12','3.13']

steps:
- name: Check out the repository
Expand Down
20 changes: 9 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
FROM ubuntu:jammy AS python-builder
FROM ubuntu:24.04 AS python-builder

RUN apt-get update && \
apt-get install -y python3 python3-venv && \
rm -rf /var/lib/apt/lists/*
apt-get install -y python3 python3-venv

RUN python3 -m venv /venv && \
/venv/bin/pip install -U pip setuptools
Expand All @@ -14,16 +13,16 @@ COPY . /app
RUN /venv/bin/pip install /app


FROM ubuntu:jammy
FROM ubuntu:24.04

# Don't buffer stdout and stderr as it breaks realtime logging
ENV PYTHONUNBUFFERED 1
ENV PYTHONUNBUFFERED=1

# Create the user that will be used to run the app
ENV APP_UID 1001
ENV APP_GID 1001
ENV APP_USER app
ENV APP_GROUP app
ENV APP_UID=1001
ENV APP_GID=1001
ENV APP_USER=app
ENV APP_GROUP=app
RUN groupadd --gid $APP_GID $APP_GROUP && \
useradd \
--no-create-home \
Expand All @@ -40,5 +39,4 @@ RUN apt-get update && \
COPY --from=python-builder /venv /venv

USER $APP_UID
ENTRYPOINT ["tini", "-g", "--"]
CMD ["/venv/bin/kopf", "run", "--module", "capi_janitor.openstack.operator", "--all-namespaces"]
CMD ["/venv/bin/kopf", "run", "--module", "capi_janitor.openstack.operator", "--all-namespaces", "--verbose"]
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tool.ruff]
# Match Black's style
line-length = 88
target-version = "py310" # adjust to your minimum supported Python version
target-version = "py312" # adjust to your minimum supported Python version

# Match Flake8/hacking exclude patterns
exclude = [
Expand Down
Loading