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
2 changes: 1 addition & 1 deletion .github/workflows/ai-code-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
id: setup-uv
with:
version: "0.5.5"
version: "0.12.5"
enable-cache: true
- name: Find existing Claude bot comment
id: find-comment
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backend-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
id: setup-uv
with:
version: "0.5.5"
version: "0.12.5"
enable-cache: true

- name: Install python dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backend-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
id: setup-uv
with:
version: "0.5.5"
version: "0.12.5"
enable-cache: true
- run: pip install codecov

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/claude.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
id: setup-uv
with:
version: "0.5.5"
version: "0.12.5"
enable-cache: true
- name: Run Claude
uses: anthropics/claude-code-action@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/graphql-schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Install uv
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
with:
version: "0.5.5"
version: "0.12.5"
enable-cache: true

- name: Install dependencies
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile.python.local
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ ARG FUNCTION_DIR
RUN mkdir -p ${FUNCTION_DIR}
WORKDIR ${FUNCTION_DIR}

RUN pip install uv==0.5.5
COPY --from=ghcr.io/astral-sh/uv:0.12.5 /uv /uvx /usr/local/bin/
ENV UV_PROJECT_ENVIRONMENT=/opt/venv
ENV PATH="/opt/venv/bin:${PATH}"

RUN mkdir -p ${FUNCTION_DIR}/assets

Expand Down
16 changes: 10 additions & 6 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,22 @@ FROM base AS build-stage

ARG FUNCTION_DIR

RUN apt-get update -y && apt-get install -y \
gcc git
RUN apt-get update -y && apt-get install -y gcc git

RUN mkdir -p ${FUNCTION_DIR}
WORKDIR ${FUNCTION_DIR}

RUN pip install uv==0.5.5
COPY --from=ghcr.io/astral-sh/uv:0.12.5 /uv /uvx /usr/local/bin/
ENV UV_PROJECT_ENVIRONMENT=/opt/venv
ENV PATH="/opt/venv/bin:${PATH}"

COPY pyproject.toml uv.lock ./

RUN uv sync --no-dev

COPY . ./

RUN .venv/bin/python manage.py graphql_schema
RUN python manage.py graphql_schema

# Build custom admin components

Expand Down Expand Up @@ -81,12 +82,15 @@ ENV NLTK_DATA=/home/app/nltk_data
COPY --chown=app:app --from=js-stage ${FUNCTION_DIR}/dist/*.html ${FUNCTION_DIR}/custom_admin/templates/astro/
COPY --chown=app:app --from=js-stage ${FUNCTION_DIR}/dist/widgets/*.html ${FUNCTION_DIR}/custom_admin/templates/astro/widgets/
COPY --chown=app:app --from=js-stage ${FUNCTION_DIR}/dist/_astro ${FUNCTION_DIR}/custom_admin/static/_astro/
COPY --chown=app:app --from=build-stage ${FUNCTION_DIR}/.venv ${FUNCTION_DIR}/.venv
COPY --chown=app:app --from=build-stage /opt/venv /opt/venv

COPY --chown=app:app . ${FUNCTION_DIR}
COPY ./entrypoint.sh /entrypoint.sh

RUN mkdir -p assets && .venv/bin/python manage.py collectstatic --noinput
ENV UV_PROJECT_ENVIRONMENT=/opt/venv
ENV PATH="/opt/venv/bin:${PATH}"

RUN mkdir -p assets && python manage.py collectstatic --noinput

ENV PGSSLCERT=/tmp/postgresql.crt

Expand Down
2 changes: 1 addition & 1 deletion infrastructure/applications/pycon_backend/web_task.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resource "aws_ecs_task_definition" "web" {
essential = true

command = [
"/home/app/.venv/bin/gunicorn", "-w", "5", "-b", "0.0.0.0:8000", "pycon.wsgi"
"gunicorn", "-w", "5", "-b", "0.0.0.0:8000", "pycon.wsgi"
]

dockerLabels = {
Expand Down
6 changes: 3 additions & 3 deletions infrastructure/applications/pycon_backend/worker.tf
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ resource "aws_ecs_task_definition" "worker" {
essential = true

command = [
"/home/app/.venv/bin/celery", "-A", "pycon", "worker", "-l", "info", "-E"
"celery", "-A", "pycon", "worker", "-l", "info", "-E"
]

environment = local.env_vars
Expand Down Expand Up @@ -261,7 +261,7 @@ resource "aws_ecs_task_definition" "worker" {
essential = false

command = [
"/home/app/.venv/bin/python", "manage.py", "migrate"
"bin/python", "manage.py", "migrate"
]

environment = local.env_vars
Expand Down Expand Up @@ -312,7 +312,7 @@ resource "aws_ecs_task_definition" "beat" {
essential = true

command = [
"/home/app/.venv/bin/celery", "-A", "pycon", "beat", "-l", "info"
"celery", "-A", "pycon", "beat", "-l", "info"
]

environment = local.env_vars
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ resource "aws_ecs_task_definition" "heavy_processing_worker" {
essential = true

command = [
"/home/app/.venv/bin/celery", "-A", "pycon", "worker", "-l", "info", "-Q", "heavy_processing", "--hostname", "heavyprocessing@%h", "-E"
"celery", "-A", "pycon", "worker", "-l", "info", "-Q", "heavy_processing", "--hostname", "heavyprocessing@%h", "-E"
]

environment = local.env_vars
Expand Down
Loading