diff --git a/services/backend/Dockerfile b/services/backend/Dockerfile index 2ab36d9..68f0eb8 100644 --- a/services/backend/Dockerfile +++ b/services/backend/Dockerfile @@ -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 diff --git a/services/backend/hotpocket_backend/apps/core/types.py b/services/backend/hotpocket_backend/apps/core/types.py index a23487c..853dfed 100644 --- a/services/backend/hotpocket_backend/apps/core/types.py +++ b/services/backend/hotpocket_backend/apps/core/types.py @@ -24,7 +24,7 @@ class PSettings(typing.Protocol): SITE_TITLE: str SITE_SHORT_TITLE: str - IMAGE_TAG: str + IMAGE_ID: str SAVES_SAVE_ADAPTER: str SAVES_ASSOCIATION_ADAPTER: str diff --git a/services/backend/hotpocket_backend/apps/ui/context_processors.py b/services/backend/hotpocket_backend/apps/ui/context_processors.py index 5a84adc..7959832 100644 --- a/services/backend/hotpocket_backend/apps/ui/context_processors.py +++ b/services/backend/hotpocket_backend/apps/ui/context_processors.py @@ -15,7 +15,7 @@ def site_title(request: HttpRequest) -> dict: def image_tag(request: HttpRequest) -> dict: return { - 'IMAGE_TAG': settings.IMAGE_TAG, + 'IMAGE_ID': settings.IMAGE_ID, } diff --git a/services/backend/hotpocket_backend/apps/ui/templates/ui/base.html b/services/backend/hotpocket_backend/apps/ui/templates/ui/base.html index b59aa34..ba08510 100644 --- a/services/backend/hotpocket_backend/apps/ui/templates/ui/base.html +++ b/services/backend/hotpocket_backend/apps/ui/templates/ui/base.html @@ -14,7 +14,7 @@ - + {% block title %}{% translate 'Not Found' %}{% endblock %} | {{ SITE_TITLE }} diff --git a/services/backend/hotpocket_backend/apps/ui/templates/ui/ui/partials/uname.html b/services/backend/hotpocket_backend/apps/ui/templates/ui/ui/partials/uname.html index afc5994..c6cb7dc 100644 --- a/services/backend/hotpocket_backend/apps/ui/templates/ui/ui/partials/uname.html +++ b/services/backend/hotpocket_backend/apps/ui/templates/ui/ui/partials/uname.html @@ -1,7 +1,7 @@

{{ SITE_TITLE }} - ({{ IMAGE_TAG }}) + ({{ IMAGE_ID }})
Copyright © 2025-present by BTHLabs. All rights reserved. diff --git a/services/backend/hotpocket_backend/settings/base.py b/services/backend/hotpocket_backend/settings/base.py index d2b517c..7c905fd 100644 --- a/services/backend/hotpocket_backend/settings/base.py +++ b/services/backend/hotpocket_backend/settings/base.py @@ -189,7 +189,7 @@ SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') AUTHENTICATION_BACKENDS = [ ] -IMAGE_TAG = os.getenv('HOTPOCKET_BACKEND_IMAGE_TAG', 'development.00000000') +IMAGE_ID = os.getenv('HOTPOCKET_BACKEND_IMAGE_ID', 'development.00000000') MODEL_AUTH_IS_DISABLED = ( os.getenv('HOTPOCKET_BACKEND_MODEL_AUTH_IS_DISABLED', 'false').lower() == 'true' diff --git a/services/backend/ops/bin/entrypoint-deployment.sh b/services/backend/ops/bin/entrypoint-deployment.sh index f7aaf8b..adddf75 100755 --- a/services/backend/ops/bin/entrypoint-deployment.sh +++ b/services/backend/ops/bin/entrypoint-deployment.sh @@ -13,7 +13,7 @@ cat <