[incubator-devlake] branch main updated: Fix permission denied of nginx (#2375)

[kl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

klesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new bc0edaec Fix permission denied of nginx (#2375)
bc0edaec is described below

commit bc0edaecf38ccdd90c1c07d3b008e911e1280062
Author: mappjzc <zh...@merico.dev>
AuthorDate: Wed Jun 29 09:48:50 2022 +0800

    Fix permission denied of nginx (#2375)
    
    * fix: fix permission denied of nginx
    
    changed bind port to 4000 from 80 for no root permission.
    
    Nddtfjiang <zh...@merico.dev>
    
    * fix: change export port
    
    change export port 80,443 to 4000,4443
    
    Nddtfjiang <zh...@merico.dev>
    
    * fix: deployments and service config-ui port change
    
    changed deployments and service config-ui port
    
    Nddtfjiang <zh...@merico.dev>
---
 config-ui/Dockerfile                       | 2 +-
 config-ui/nginx.conf                       | 2 +-
 deployment/helm/templates/deployments.yaml | 2 +-
 deployment/helm/templates/services.yaml    | 2 +-
 docker-compose.yml                         | 2 +-
 k8s-deploy.yaml                            | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config-ui/Dockerfile b/config-ui/Dockerfile
index bf3ca7bc..7b1418e1 100644
--- a/config-ui/Dockerfile
+++ b/config-ui/Dockerfile
@@ -40,7 +40,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf.tpl
 WORKDIR /usr/share/nginx/html
 RUN rm -rf ./*
 COPY --from=builder /home/node/code/dist/. ./
-EXPOSE 80 443
+EXPOSE 4000 4443
 RUN apt update && apt install -y apache2-utils
 COPY ./nginx.sh /usr/bin/nginx.sh
 RUN chmod +x /usr/bin/nginx.sh
diff --git a/config-ui/nginx.conf b/config-ui/nginx.conf
index 82b02448..f868324f 100644
--- a/config-ui/nginx.conf
+++ b/config-ui/nginx.conf
@@ -1,5 +1,5 @@
 server {
-  listen 80;
+  listen 4000;
   server_name localhost;
 ${SERVER_CONF}
 
diff --git a/deployment/helm/templates/deployments.yaml b/deployment/helm/templates/deployments.yaml
index b00a61d3..fe3a2494 100644
--- a/deployment/helm/templates/deployments.yaml
+++ b/deployment/helm/templates/deployments.yaml
@@ -114,7 +114,7 @@ spec:
           image: "{{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag }}"
           imagePullPolicy: {{ .Values.ui.image.pullPolicy }}
           ports:
-            - containerPort: 80
+            - containerPort: 4000
           envFrom:
             - configMapRef:
                 name: {{ include "devlake.fullname" . }}-config
diff --git a/deployment/helm/templates/services.yaml b/deployment/helm/templates/services.yaml
index 31134a4c..8d519f64 100644
--- a/deployment/helm/templates/services.yaml
+++ b/deployment/helm/templates/services.yaml
@@ -91,7 +91,7 @@ spec:
     - protocol: TCP
       name: ui
       port: {{ .Values.service.uiPort }}
-      targetPort: 80
+      targetPort: 4000
       {{- if eq .Values.service.type "NodePort" }}
       nodePort: {{ .Values.service.uiPort }}
       {{- end }}
diff --git a/docker-compose.yml b/docker-compose.yml
index 6069df69..da39dde6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -81,7 +81,7 @@ services:
     build:
       context: "config-ui"
     ports:
-      - 127.0.0.1:4000:80
+      - 127.0.0.1:4000:4000
     env_file:
       - ./.env
     environment:
diff --git a/k8s-deploy.yaml b/k8s-deploy.yaml
index 0ed7911e..dbbd56de 100644
--- a/k8s-deploy.yaml
+++ b/k8s-deploy.yaml
@@ -137,7 +137,7 @@ spec:
         - name: config-ui
           image: mericodev/config-ui:latest
           ports:
-            - containerPort: 80
+            - containerPort: 4000
           envFrom:
             - configMapRef:
                 name: devlake-config
@@ -163,7 +163,7 @@ spec:
   ports:
     - protocol: TCP
       port: 4000
-      targetPort: 80
+      targetPort: 4000
       nodePort: 30004
 
 ---