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/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
uses: actions/checkout@v5
with:
repository: SAFEHR-data/PIXL
ref: e29f4b15c3b9d21c9a6e08c272aca7773311b32c # pragma: allowlist secret
ref: 367da6956fa10e3768e03fb0645904348f015a08 # pragma: allowlist secret
path: PIXL
- name: Checkout private SQL scripts
uses: actions/checkout@v5
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.13-slim-bookworm@sha256:8092ae2ef67061f9db412458dbdce44dbf16748fb3cae5cdbd020f467a9712d0 AS waveform_base
FROM python:3.13.18-slim-bookworm@sha256:281d39ff02e3b389401586134ff9e6572954687822a58055ec07a60ded4e0b7f AS waveform_base
LABEL authors="Stephen Thompson, Jeremy Stein"
# Cron is really small. For the sake of not having to reinstall it all the time,
# put it on both images even though we only need it on exporter.
Expand All @@ -10,8 +10,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libkrb5-3 \
libltdl7 && \
apt-get autoremove --yes && apt-get clean --yes && rm -rf /var/lib/apt/lists/*
# uv image label "0.12.5"
COPY --from=ghcr.io/astral-sh/uv@sha256:e85be844203885286c60ffad8a858d48afb6c5a5c237ca0e67f12e74b8f174b1 /uv /uvx /bin/
COPY --from=ghcr.io/astral-sh/uv:0.13.6@sha256:af22a52f5eafef3d78e551599d405c02df61919d18028f0cea8eda93bc9986d0 /uv /uvx /bin/
ARG UVCACHE=/root/.cache/uv
COPY PIXL /PIXL
WORKDIR /app
Expand Down
3 changes: 3 additions & 0 deletions config.EXAMPLE/hasher.env.EXAMPLE
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ AZURE_KEY_VAULT_NAME=
# and can be fixed and is not secret itself
AZURE_KEY_VAULT_SECRET_NAME="waveform-secret-key" # pragma: allowlist secret

# Hasher needs this to point to different keyvaults
AZURE_KEY_VAULT_SUFFIX=vault.azure.net

# en/disable telemetry in the hasher
OTEL_SDK_DISABLED=true
OTEL_EXPORTER_OTLP_ENDPOINT="http://lgtm:4318"
5 changes: 2 additions & 3 deletions monitoring/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.13-slim-bookworm@sha256:8092ae2ef67061f9db412458dbdce44dbf16748fb3cae5cdbd020f467a9712d0 AS supercronic_base
FROM python:3.13.18-slim-bookworm@sha256:281d39ff02e3b389401586134ff9e6572954687822a58055ec07a60ded4e0b7f AS supercronic_base
LABEL authors="Stephen Thompson, Jeremy Stein"

RUN export DEBIAN_FRONTEND=noninteractive && \
Expand All @@ -23,8 +23,7 @@ RUN case "${TARGETARCH}" in \
&& mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \
&& ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic

# uv image label "0.12.5"
COPY --from=ghcr.io/astral-sh/uv@sha256:e85be844203885286c60ffad8a858d48afb6c5a5c237ca0e67f12e74b8f174b1 /uv /uvx /bin/
COPY --from=ghcr.io/astral-sh/uv:0.13.6@sha256:af22a52f5eafef3d78e551599d405c02df61919d18028f0cea8eda93bc9986d0 /uv /uvx /bin/

ARG UVCACHE=/root/.cache/uv
WORKDIR /app
Expand Down
63 changes: 10 additions & 53 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading