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

Optimise safety dockerfile #2981

Merged
merged 2 commits into from May 7, 2023
Merged

Optimise safety dockerfile #2981

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a06abb6
Begin optimise safety Dockerfile
olliestanley Apr 30, 2023
f406775
Fix
olliestanley Apr 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 11 additions & 18 deletions docker/inference/Dockerfile.safety
View file
Open in desktop
Expand Up @@ -6,7 +6,6 @@ ARG SERVICE="safety"
ARG APP_USER="${MODULE}-${SERVICE}"
ARG APP_RELATIVE_PATH="${MODULE}/${SERVICE}"


FROM python:3.10-slim as build
ARG APP_RELATIVE_PATH

Expand All @@ -24,9 +23,7 @@ RUN --mount=type=cache,target=/var/cache/pip \
--target=lib \
-r requirements.txt



FROM python:3.10-slim as base-env
FROM python:3.10-slim as prod
ARG APP_USER
ARG APP_RELATIVE_PATH
ARG MODULE
Expand All @@ -41,32 +38,28 @@ ENV PATH="${PATH}:${APP_LIBS}/bin"
ENV PYTHONPATH="${PYTHONPATH}:${APP_LIBS}"
ENV PORT="8002"


RUN adduser \
--disabled-password \
"${APP_USER}"
"${APP_USER}" && \
mkdir -p ${APP_ROOT} ${APP_LIBS} && \
chown -R "${APP_USER}:${APP_USER}" "${APP_BASE}"

USER ${APP_USER}

WORKDIR ${APP_ROOT}


COPY --chown="${APP_USER}:${APP_USER}" --from=build /build/lib ${APP_LIBS}
COPY --chown="${APP_USER}:${APP_USER}" --from=build /build/lib ${APP_LIBS}
COPY --chown="${APP_USER}:${APP_USER}" ./${APP_RELATIVE_PATH}/*.py .


CMD python3 main.py

FROM base-env as prod
ARG APP_USER


COPY --chown="${APP_USER}:${APP_USER}" ./oasst-shared /tmp/lib/oasst-shared
RUN --mount=type=cache,target=/var/cache/pip,from=base-env \

USER root
RUN --mount=type=cache,target=/var/cache/pip \
pip install \
--cache-dir=/var/cache/pip \
--target="${APP_LIBS}" \
/tmp/lib/oasst-shared
/tmp/lib/oasst-shared && \
rm -rf /tmp/lib/oasst-shared
USER ${APP_USER}

COPY --chown="${APP_USER}:${APP_USER}" ./inference/safety/safety_main.sh /entrypoint.sh

Expand Down