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