From 1a2551f7e7d0375f555a395fa262079552ea18aa Mon Sep 17 00:00:00 2001 From: jmal Date: Fri, 31 May 2024 15:40:16 +0800 Subject: [PATCH 1/5] chore: update nginx-drawio Dockerfile --- docker/nginx-drawio/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/nginx-drawio/Dockerfile b/docker/nginx-drawio/Dockerfile index 733399d..a68ac67 100644 --- a/docker/nginx-drawio/Dockerfile +++ b/docker/nginx-drawio/Dockerfile @@ -4,10 +4,10 @@ RUN apt-get update && apt-get install -y unzip wget RUN wget https://github.com/jgraph/drawio/releases/download/v24.4.10/draw.war -O /var/www/draw.war +RUN mkdir -p /etc/nginx/servers /var/www + RUN unzip /var/www/draw.war -d /var/www/draw RUN rm -rf /var/www/draw.war /var/www/draw/META-INF /var/www/draw/WEB-INF -RUN mkdir -p /etc/nginx/servers - COPY docker/nginx-drawio/drawio.conf /etc/nginx/servers/drawio.conf From 70c999dcbe0f764b062609581299cd590acf6c0e Mon Sep 17 00:00:00 2001 From: jmal Date: Fri, 31 May 2024 15:42:08 +0800 Subject: [PATCH 2/5] chore: update nginx-drawio Dockerfile --- docker/nginx-drawio/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/nginx-drawio/Dockerfile b/docker/nginx-drawio/Dockerfile index a68ac67..b501e1f 100644 --- a/docker/nginx-drawio/Dockerfile +++ b/docker/nginx-drawio/Dockerfile @@ -2,10 +2,10 @@ FROM nginx:latest RUN apt-get update && apt-get install -y unzip wget -RUN wget https://github.com/jgraph/drawio/releases/download/v24.4.10/draw.war -O /var/www/draw.war - RUN mkdir -p /etc/nginx/servers /var/www +RUN wget https://github.com/jgraph/drawio/releases/download/v24.4.10/draw.war -O /var/www/draw.war + RUN unzip /var/www/draw.war -d /var/www/draw RUN rm -rf /var/www/draw.war /var/www/draw/META-INF /var/www/draw/WEB-INF From 680a9940523fed82e4e4fac683253f7e92df1c75 Mon Sep 17 00:00:00 2001 From: jmal Date: Fri, 31 May 2024 15:46:57 +0800 Subject: [PATCH 3/5] chore: update nginx-drawio Dockerfile --- docker/nginx-drawio/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/nginx-drawio/Dockerfile b/docker/nginx-drawio/Dockerfile index b501e1f..8a89592 100644 --- a/docker/nginx-drawio/Dockerfile +++ b/docker/nginx-drawio/Dockerfile @@ -10,4 +10,8 @@ RUN unzip /var/www/draw.war -d /var/www/draw RUN rm -rf /var/www/draw.war /var/www/draw/META-INF /var/www/draw/WEB-INF +RUN apt-get remove -y unzip wget && \ + apt-get autoremove -y && \ + apt-get clean + COPY docker/nginx-drawio/drawio.conf /etc/nginx/servers/drawio.conf From 52e7535e15f65bc6b75edf8fb60d8c60ccb9b77c Mon Sep 17 00:00:00 2001 From: jmal Date: Fri, 31 May 2024 15:54:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?chore:=20=E5=B0=86drawio=E9=9B=86=E6=88=90?= =?UTF-8?q?=E5=88=B0jmalcloud=5Fnginx=E9=95=9C=E5=83=8F=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- nginx.conf | 6 +++--- src/components/office/Drawio.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1654b55..d84c7cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:latest +FROM jmal/nginx-drawio:latest COPY nginx.conf /etc/nginx/nginx.conf diff --git a/nginx.conf b/nginx.conf index 56edb75..c792359 100644 --- a/nginx.conf +++ b/nginx.conf @@ -178,12 +178,12 @@ http { proxy_set_header Connection $connection_upgrade; } - location /draw { - proxy_pass http://jmalcloud:8080; + location /drawio/webapp/ { + proxy_pass http://localhost:8080/; proxy_http_version 1.1; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-PORT $remote_port; - proxy_set_header X-Forwarded-Host $the_host/draw; + proxy_set_header X-Forwarded-Host $the_host//drawio/webapp; proxy_set_header X-Forwarded-Proto $the_scheme; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; diff --git a/src/components/office/Drawio.vue b/src/components/office/Drawio.vue index b0ee3b7..b7792d0 100644 --- a/src/components/office/Drawio.vue +++ b/src/components/office/Drawio.vue @@ -85,7 +85,7 @@ export default { let theme = 'kennedy' let title = this.file.name ? encodeURIComponent(this.file.name) : '' let query = `?title=${title}&chrome=${chrome}&lightbox=${lightbox}&ui=${theme}&lang=${language}&offline=0&pwa=0&embed=1&noLangIcon=1&noExitBtn=1&noSaveBtn=1&saveAndExit=0&spin=1&proto=json` - this.url = $J.apiUrl(`../draw/?${query}`) + this.url = $J.apiUrl(`..../drawio/webapp/?${query}`) }, mounted() { window.addEventListener('message', this.handleMessage) From 66e3c5c7446cfa25920b5ba051824aebdef83cad Mon Sep 17 00:00:00 2001 From: jmal Date: Fri, 31 May 2024 16:00:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?chore:=20=E5=B0=86drawio=E9=9B=86=E6=88=90?= =?UTF-8?q?=E5=88=B0jmalcloud=5Fnginx=E9=95=9C=E5=83=8F=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/office/Drawio.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/office/Drawio.vue b/src/components/office/Drawio.vue index b7792d0..3717050 100644 --- a/src/components/office/Drawio.vue +++ b/src/components/office/Drawio.vue @@ -85,7 +85,7 @@ export default { let theme = 'kennedy' let title = this.file.name ? encodeURIComponent(this.file.name) : '' let query = `?title=${title}&chrome=${chrome}&lightbox=${lightbox}&ui=${theme}&lang=${language}&offline=0&pwa=0&embed=1&noLangIcon=1&noExitBtn=1&noSaveBtn=1&saveAndExit=0&spin=1&proto=json` - this.url = $J.apiUrl(`..../drawio/webapp/?${query}`) + this.url = $J.apiUrl(`../drawio/webapp/${query}`) }, mounted() { window.addEventListener('message', this.handleMessage)