From 41e4ec967304597340cd76b305244753f0a9519a Mon Sep 17 00:00:00 2001 From: Jason Thomas Date: Tue, 17 Dec 2024 16:27:37 -0700 Subject: [PATCH] Update traefik config tools-router --- docs.openc3.com/docs/getting-started/upgrading.md | 6 +++++- openc3-traefik/traefik-allow-http.yaml | 2 +- openc3-traefik/traefik-dev-base.yaml | 2 +- openc3-traefik/traefik-dev.yaml | 2 +- openc3-traefik/traefik-letsencrypt.yaml | 2 +- openc3-traefik/traefik-ssl.yaml | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docs.openc3.com/docs/getting-started/upgrading.md b/docs.openc3.com/docs/getting-started/upgrading.md index d3ebe4322..4fa69ed4b 100644 --- a/docs.openc3.com/docs/getting-started/upgrading.md +++ b/docs.openc3.com/docs/getting-started/upgrading.md @@ -10,6 +10,10 @@ sidebar_custom_props: COSMOS is released as Docker containers. Since we're using Docker containers and volumes we can simply stop the existing COSMOS application, then download and run the new release. +:::info Release Notes +Always check the release notes associated with the release on the [releases](https://github.com/OpenC3/cosmos/releases) page. Sometimes there are migration notes. +::: + This example assumes an existing COSMOS project at C:\cosmos-project. 1. Stop the current COSMOS application @@ -39,7 +43,7 @@ In general, patch releases (x.y.Z) can be downgraded, minor releases (x.Y.z) _mi ## Migrating From COSMOS 5 to COSMOS 6 :::info Developers Only -If you haven't written any custom tools or widgets, there are no special changes required to upgrade from COSMOS 5 to COSMOS 6. Simply follow the normal upgrade instructions above. +If you haven't written any custom tools or widgets, there are no special changes required to upgrade from COSMOS 5 to COSMOS 6. Simply follow the normal upgrade instructions above including following the release notes. ::: COSMOS 6 introduces some breaking changes for custom tools regarding the Vue framework and our common library code. We've upgraded from Vue 2 (EOL December 31, 2023) to Vue 3. These versions of Vue are not compatible with each other, so any tools written with Vue 2 will need to be updated. Additionally, our `@openc3/tool-common` NPM package has been deprecated with its functionality reorganized into two packages: `@openc3/js-common` and `@openc3/vue-common`. This is to provide a better experience for developers who are building COSMOS tools without the Vue framework. diff --git a/openc3-traefik/traefik-allow-http.yaml b/openc3-traefik/traefik-allow-http.yaml index c6cc7bf55..cef137222 100644 --- a/openc3-traefik/traefik-allow-http.yaml +++ b/openc3-traefik/traefik-allow-http.yaml @@ -49,7 +49,7 @@ http: # Matches any path with a file extension which is assumed to be # a static file tools-router: - rule: PathRegexp(`/tools/.*/.*[.].*`) + rule: PathRegexp(`/tools/.*/.*[.](ttf|otf|woff|woff2|html|js|css|png|jpg|jpeg|gif|svg|ico|json|xml|txt|pdf|zip|tar|gz|tgz|csv|tsv|md|yaml|yml|bin|doc|docx|xls|xlsx|ppt|pptx|mp4|mp3|wav|avi|mov|flv|swf|apk|ipa|deb|rpm|exe|msi|dmg|pkg|sh|bat|cmd|ps1|py|pl|rb|php|java|class|jar|war|ear|so|dll|lib|a|o|obj|pdb|pdb|lib|dylib|framework)`) service: service-minio priority: 6 # Route to other tool plugins hosted statically in Minio diff --git a/openc3-traefik/traefik-dev-base.yaml b/openc3-traefik/traefik-dev-base.yaml index dd2bfa396..7c09a508e 100644 --- a/openc3-traefik/traefik-dev-base.yaml +++ b/openc3-traefik/traefik-dev-base.yaml @@ -47,7 +47,7 @@ http: # Matches any path with a file extension which is assumed to be # a static file tools-router: - rule: PathRegexp(`/tools/.*/.*[.].*`) + rule: PathRegexp(`/tools/.*/.*[.](ttf|otf|woff|woff2|html|js|css|png|jpg|jpeg|gif|svg|ico|json|xml|txt|pdf|zip|tar|gz|tgz|csv|tsv|md|yaml|yml|bin|doc|docx|xls|xlsx|ppt|pptx|mp4|mp3|wav|avi|mov|flv|swf|apk|ipa|deb|rpm|exe|msi|dmg|pkg|sh|bat|cmd|ps1|py|pl|rb|php|java|class|jar|war|ear|so|dll|lib|a|o|obj|pdb|pdb|lib|dylib|framework)`) service: service-minio priority: 4 # Route to other tool plugins hosted statically in Minio diff --git a/openc3-traefik/traefik-dev.yaml b/openc3-traefik/traefik-dev.yaml index 17a6ee9f5..c4b8a1aa7 100644 --- a/openc3-traefik/traefik-dev.yaml +++ b/openc3-traefik/traefik-dev.yaml @@ -49,7 +49,7 @@ http: # Matches any path with a file extension which is assumed to be # a static file tools-router: - rule: PathRegexp(`/tools/.*/.*[.].*`) + rule: PathRegexp(`/tools/.*/.*[.](ttf|otf|woff|woff2|html|js|css|png|jpg|jpeg|gif|svg|ico|json|xml|txt|pdf|zip|tar|gz|tgz|csv|tsv|md|yaml|yml|bin|doc|docx|xls|xlsx|ppt|pptx|mp4|mp3|wav|avi|mov|flv|swf|apk|ipa|deb|rpm|exe|msi|dmg|pkg|sh|bat|cmd|ps1|py|pl|rb|php|java|class|jar|war|ear|so|dll|lib|a|o|obj|pdb|pdb|lib|dylib|framework)`) service: service-minio priority: 6 # Route to other tool plugins hosted statically in Minio diff --git a/openc3-traefik/traefik-letsencrypt.yaml b/openc3-traefik/traefik-letsencrypt.yaml index db2f66664..b127759fd 100644 --- a/openc3-traefik/traefik-letsencrypt.yaml +++ b/openc3-traefik/traefik-letsencrypt.yaml @@ -74,7 +74,7 @@ http: # Matches any path with a file extension which is assumed to be # a static file tools-router: - rule: PathRegexp(`/tools/.*/.*[.].*`) + rule: PathRegexp(`/tools/.*/.*[.](ttf|otf|woff|woff2|html|js|css|png|jpg|jpeg|gif|svg|ico|json|xml|txt|pdf|zip|tar|gz|tgz|csv|tsv|md|yaml|yml|bin|doc|docx|xls|xlsx|ppt|pptx|mp4|mp3|wav|avi|mov|flv|swf|apk|ipa|deb|rpm|exe|msi|dmg|pkg|sh|bat|cmd|ps1|py|pl|rb|php|java|class|jar|war|ear|so|dll|lib|a|o|obj|pdb|pdb|lib|dylib|framework)`) service: service-minio priority: 6 tls: diff --git a/openc3-traefik/traefik-ssl.yaml b/openc3-traefik/traefik-ssl.yaml index d36889bc1..b964b132c 100644 --- a/openc3-traefik/traefik-ssl.yaml +++ b/openc3-traefik/traefik-ssl.yaml @@ -68,7 +68,7 @@ http: # Matches any path with a file extension which is assumed to be # a static file tools-router: - rule: PathRegexp(`/tools/.*/.*[.].*`) + rule: PathRegexp(`/tools/.*/.*[.](ttf|otf|woff|woff2|html|js|css|png|jpg|jpeg|gif|svg|ico|json|xml|txt|pdf|zip|tar|gz|tgz|csv|tsv|md|yaml|yml|bin|doc|docx|xls|xlsx|ppt|pptx|mp4|mp3|wav|avi|mov|flv|swf|apk|ipa|deb|rpm|exe|msi|dmg|pkg|sh|bat|cmd|ps1|py|pl|rb|php|java|class|jar|war|ear|so|dll|lib|a|o|obj|pdb|pdb|lib|dylib|framework)`) service: service-minio priority: 6 tls: {}