Skip to content
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

Jump to bottom

Use uv in Docker build #460

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Use uv in Docker build #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a38f5c9
Require hashes for sync
magnuswatn Apr 28, 2024
95229fe
use uv in docker build
magnuswatn Apr 28, 2024
097b4f0
trigger ci
magnuswatn Apr 28, 2024
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
32 changes: 19 additions & 13 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ RUN set -x \
&& apt-get install --no-install-recommends -y \
gcc curl libc6-dev

# install uv
RUN curl -LsSf https://astral.sh/uv/install.sh | sh

# (uv is installed to .cargo/bin)
ENV PATH="/root/.cargo/bin/:${PATH}"

#
# Python container for building the Rust lib
#
Expand All @@ -52,15 +58,13 @@ FROM build-base as rust-build
RUN set -x && curl https://sh.rustup.rs -sSf | sh -s -- -y \
--default-toolchain stable --profile minimal

ENV PATH="/root/.cargo/bin/:${PATH}"

RUN set -x && python3 -m venv /opt/sertifikatsok/rust-venv
RUN set -x && /opt/sertifikatsok/rust-venv/bin/pip --no-cache-dir --disable-pip-version-check install --upgrade pip
RUN set -x && uv venv --seed /opt/sertifikatsok/rust-venv
ENV VIRTUAL_ENV="/opt/sertifikatsok/rust-venv"

COPY requirements/ruldap3.txt /tmp/ruldap-requirements.txt

RUN set -x \
&& /opt/sertifikatsok/rust-venv/bin/pip install --require-hashes -r /tmp/ruldap-requirements.txt
&& uv pip sync --require-hashes /tmp/ruldap-requirements.txt

COPY ruldap3 /opt/sertifikatsok/ruldap3

Expand All @@ -74,15 +78,19 @@ RUN set -x \
FROM build-base as build

# Create venv for the app
RUN set -x && python3 -m venv /opt/sertifikatsok/venv
RUN set -x && /opt/sertifikatsok/venv/bin/pip --no-cache-dir --disable-pip-version-check install --upgrade pip
RUN set -x && uv venv --seed /opt/sertifikatsok/venv
ENV VIRTUAL_ENV="/opt/sertifikatsok/venv"
ENV PATH="/opt/sertifikatsok/venv/bin:${PATH}"

COPY requirements/main.txt /tmp/requirements.txt

RUN set -x \
&& cd /tmp \
&& /opt/sertifikatsok/venv/bin/pip install --require-hashes -r /tmp/requirements.txt
&& uv pip sync --require-hashes /tmp/requirements.txt

COPY --from=rust-build /opt/sertifikatsok/ruldap3/target/wheels /opt/sertifikatsok/ruldap3/target/wheels

RUN uv pip install /opt/sertifikatsok/ruldap3/target/wheels/*

#
# Python container for testing
Expand All @@ -93,11 +101,12 @@ COPY requirements/dev.txt /tmp/requirements.dev.txt

RUN set -x \
&& cd /tmp \
&& /opt/sertifikatsok/venv/bin/pip install --require-hashes -r /tmp/requirements.dev.txt
&& uv pip sync --require-hashes /tmp/requirements.txt /tmp/requirements.dev.txt

# (ruldap3 was removed by the `uv pip sync` above, so we need to reinstall it)
COPY --from=rust-build /opt/sertifikatsok/ruldap3/target/wheels /opt/sertifikatsok/ruldap3/target/wheels

RUN pip install /opt/sertifikatsok/ruldap3/target/wheels/*
RUN uv pip install /opt/sertifikatsok/ruldap3/target/wheels/*

#
# PROD container
Expand All @@ -112,9 +121,6 @@ WORKDIR /opt/sertifikatsok/api

COPY --from=www-build /opt/sertifikatsok/www/dist /opt/sertifikatsok/www/
COPY --from=build /opt/sertifikatsok/venv/ /opt/sertifikatsok/venv/
COPY --from=rust-build /opt/sertifikatsok/ruldap3/target/wheels /opt/sertifikatsok/ruldap3/target/wheels

RUN pip install /opt/sertifikatsok/ruldap3/target/wheels/*

COPY api /opt/sertifikatsok/api

Expand Down
2 changes: 1 addition & 1 deletion Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set positional-arguments
uv venv -p python3.11

@pip-sync:
uv pip sync requirements/main.txt requirements/dev.txt requirements/ruldap3.txt
uv pip sync --require-hashes requirements/main.txt requirements/dev.txt requirements/ruldap3.txt

@sync: pip-sync update-lib

Expand Down
Loading