From b8d5a0a56531aa4f87c91988f91fd9f87843298b Mon Sep 17 00:00:00 2001 From: subochev Date: Fri, 27 Mar 2026 00:37:11 +0300 Subject: [PATCH] =?UTF-8?q?DEVX-178:=20[BE]=20=D0=A0=D0=B0=D0=B7=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=82=D1=8C=20endpoint=20=D0=B2?= =?UTF-8?q?=D1=8B=D0=B4=D0=B0=D1=87=D0=B8=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80?= =?UTF-8?q?=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D0=B8=20?= =?UTF-8?q?=D1=84=D0=B5=D0=B9=D0=BD-=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20gradle/maven?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build-frontend.yml | 23 +------------------ .../templates/deployment.yaml | 3 --- .../templates/middleware.yaml | 2 +- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/.gitea/workflows/build-frontend.yml b/.gitea/workflows/build-frontend.yml index 6289275..fd7dbdc 100644 --- a/.gitea/workflows/build-frontend.yml +++ b/.gitea/workflows/build-frontend.yml @@ -41,22 +41,7 @@ jobs: npm run build cat > entrypoint.sh < - # Запускаем nginx с переданными аргументами - #exec "$@" - echo 'Before:' - cat /etc/nginx/conf.d/default.conf - sed -i -e "s/__PREFIX__/\${PREFIX}/g" '/etc/nginx/conf.d/default.conf' - echo 'After:' - cat /etc/nginx/conf.d/default.conf exec nginx -g "daemon off;" EOF @@ -65,13 +50,7 @@ jobs: listen 80; server_name localhost; - # Редирект с /__PREFIX__ на /__PREFIX__/ - location = /__PREFIX__ { - return 301 /__PREFIX__/; - } - - location /__PREFIX__/ { - rewrite ^/__PREFIX__/(.*) /\$1 break; + location / { root /usr/share/nginx/html; try_files \$uri \$uri/ /index.html; } diff --git a/devspc/devspace-selfkit-ui/templates/deployment.yaml b/devspc/devspace-selfkit-ui/templates/deployment.yaml index 8dc826b..bc42bed 100644 --- a/devspc/devspace-selfkit-ui/templates/deployment.yaml +++ b/devspc/devspace-selfkit-ui/templates/deployment.yaml @@ -52,9 +52,6 @@ spec: {{- toYaml $.Values.securityContext | nindent 12 }} image: "{{ $.Values.image.name }}:{{ $.Values.image.version }}" imagePullPolicy: {{ $.Values.image.pullPolicy }} - env: - - name: PREFIX - value: "{{$.Values.ingress.prefix}}" ports: - name: http containerPort: {{ $.Values.port }} diff --git a/devspc/devspace-selfkit-ui/templates/middleware.yaml b/devspc/devspace-selfkit-ui/templates/middleware.yaml index 910efb6..526bcd0 100644 --- a/devspc/devspace-selfkit-ui/templates/middleware.yaml +++ b/devspc/devspace-selfkit-ui/templates/middleware.yaml @@ -7,5 +7,5 @@ metadata: spec: stripPrefix: prefixes: - - /{{$.Values.ingress.prefix}} + - {{$.Values.ingress.prefix}} {{end}} \ No newline at end of file