BTHLABS-49: WIP

This commit is contained in:
2025-08-19 08:33:44 +02:00
parent 6b959bb9ea
commit 53fdc8e12e
10 changed files with 27 additions and 28 deletions

View File

@@ -1,12 +1,12 @@
ARG APP_USER_UID=1000
ARG APP_USER_GID=1000
ARG IMAGE_TAG=development.00000000
ARG IMAGE_ID=development.00000000
FROM docker-hosted.nexus.bthlabs.pl/hotpocket/base:build-node-20250816-01 AS development
FROM docker-hosted.nexus.bthlabs.pl/hotpocket/base:build-node-20250819-01 AS development
ARG APP_USER_UID
ARG APP_USER_GID
ARG IMAGE_TAG
ARG IMAGE_ID
USER root
@@ -17,11 +17,11 @@ USER app
VOLUME ["/srv/node_modules", "/srv/venv"]
FROM docker-hosted.nexus.bthlabs.pl/hotpocket/base:build-python-20250816-01 AS deployment-build
FROM docker-hosted.nexus.bthlabs.pl/hotpocket/base:build-python-20250819-01 AS deployment-build
ARG APP_USER_UID
ARG APP_USER_GID
ARG IMAGE_TAG
ARG IMAGE_ID
RUN mkdir /srv/app/hotpocket_backend /srv/packages/common /srv/packages/soa
COPY --chown=$APP_USER_UID:$APP_USER_GID backend/hotpocket_backend/ /srv/app/hotpocket_backend/
@@ -36,13 +36,13 @@ RUN poetry install --only main,deployment && \
rm -f hotpocket_backend/settings/deployment/build.py && \
rm -rf node_modules/
FROM docker-hosted.nexus.bthlabs.pl/hotpocket/base:base-20250816-01 AS deployment-base
FROM docker-hosted.nexus.bthlabs.pl/hotpocket/base:base-20250819-01 AS deployment-base
ARG APP_USER_UID
ARG APP_USER_GID
ARG IMAGE_TAG
ARG IMAGE_ID
ENV HOTPOCKET_BACKEND_IMAGE_TAG=${IMAGE_TAG}
ENV HOTPOCKET_BACKEND_IMAGE_ID=${IMAGE_ID}
ENV PYTHONPATH="/srv/local"
COPY --from=deployment-build /srv/app /srv/app
@@ -50,8 +50,7 @@ COPY --from=deployment-build /srv/packages /srv/packages
COPY --from=deployment-build /srv/venv /srv/venv
COPY --chown=$APP_USER_UID:$APP_USER_GID backend/ops/bin/*.sh /srv/bin/
COPY --chown=$APP_USER_UID:$APP_USER_GID backend/ops/deployment/gunicorn.conf.py backend/ops/deployment/gunicorn.logging.conf /srv/lib/
RUN mkdir /srv/entrypoint.d /srv/local && \
chown -R $APP_USER_UID:$APP_USER_GID /srv
RUN chown -R $APP_USER_UID:$APP_USER_GID /srv
USER root
@@ -71,7 +70,7 @@ FROM deployment-base AS deployment
ARG APP_USER_UID
ARG APP_USER_GID
ARG IMAGE_TAG
ARG IMAGE_ID
VOLUME ["/srv/run", "/srv/uploads"]
@@ -79,7 +78,7 @@ FROM deployment-base AS aio
ARG APP_USER_UID
ARG APP_USER_GID
ARG IMAGE_TAG
ARG IMAGE_ID
ENV DJANGO_SETTINGS_MODULE=hotpocket_backend.settings.aio
ENV HOTPOCKET_BACKEND_ENV=aio