diff --git a/.gitea/workflows/build-frontend.yml b/.gitea/workflows/build-frontend.yml index 2245648..6d0bb98 100644 --- a/.gitea/workflows/build-frontend.yml +++ b/.gitea/workflows/build-frontend.yml @@ -49,20 +49,23 @@ jobs: echo 'Environments:' env # Применяем переменные окружения к шаблону конфига - envsubst '${PREFIX}' < /etc/nginx/templates/default.conf.template > /etc/nginx/conf.d/default.conf + #envsubst '${PREFIX}' < /etc/nginx/templates/default.conf.template > /etc/nginx/conf.d/default.conf + cp /etc/nginx/templates/default.conf.template /etc/nginx/conf.d/default.conf # Запускаем nginx с переданными аргументами #exec "$@" + sed -i -e "s/__PREFIX__/${PREFIX}/g" '/etc/nginx/conf.d/default.conf' echo 'Result configuration:' cat /etc/nginx/conf.d/default.conf exec nginx -g "daemon off;" EOF + cat > default.conf.template << EOF server { listen 80; server_name localhost; # Префикс из переменной окружения (по умолчанию devspace-ui) - set $prefix_internal ${PREFIX:-devspace-ui}; + set $prefix_internal __PREFIX__; # Редирект с /$prefix_internal на /$prefix_internal/ location = /$prefix_internal { diff --git a/devspc/devspace-selfkit-ui/values.yaml b/devspc/devspace-selfkit-ui/values.yaml index 13c7ca7..68feee4 100644 --- a/devspc/devspace-selfkit-ui/values.yaml +++ b/devspc/devspace-selfkit-ui/values.yaml @@ -12,4 +12,4 @@ image: version: '' ingress: host: 'ui.devx.kube.xx' - prefix: '/devspace-ui/' \ No newline at end of file + prefix: '/devspace-ui' \ No newline at end of file