From 6351340275a223e53c2de79959204167d3309ae4 Mon Sep 17 00:00:00 2001 From: mr Date: Wed, 19 Feb 2025 12:06:06 +0100 Subject: [PATCH] traefik --- docker-compose.yml | 10 ++++++---- go.mod | 2 +- go.sum | 8 ++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cb48eba..c86bbc8 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,10 +13,12 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.catalog.entrypoints=web" - - "traefik.http.middlewares.auth.forwardauth.address=http://oc-auth:8080/oc/forward" - - "traefik.http.routers.catalog.rule=PathPrefix(/catalog)" - - "traefik.http.routers.catalog.tls=false" - - "traefik.http.routers.catalog.middlewares=auth" + - "traefik.http.routers.catalog.rule=PathPrefix(`/catalog`)" + - "traefik.http.middlewares.catalog-rewrite.replacepathregex.regex=^/catalog(.*)" + - "traefik.http.middlewares.catalog-rewrite.replacepathregex.replacement=/oc$$1" + - "traefik.http.routers.catalog.middlewares=catalog-rewrite" + - "traefik.http.services.catalog.loadbalancer.server.port=8080" + - "traefik.http.middlewares.catalog.forwardauth.address=http://oc-auth:8080/oc/forward" networks: catalog: external: true \ No newline at end of file diff --git a/go.mod b/go.mod index 4f25e31..668e1a0 100755 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.0 toolchain go1.22.4 require ( - cloud.o-forge.io/core/oc-lib v0.0.0-20250218115549-81d3406305c5 + cloud.o-forge.io/core/oc-lib v0.0.0-20250219104152-3ecb0e9d960b github.com/beego/beego/v2 v2.3.4 github.com/smartystreets/goconvey v1.7.2 ) diff --git a/go.sum b/go.sum index e69e2df..fbe448d 100755 --- a/go.sum +++ b/go.sum @@ -16,6 +16,14 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20250218113916-04f7537066c1 h1:on0zLtHo1Jj6F cloud.o-forge.io/core/oc-lib v0.0.0-20250218113916-04f7537066c1/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE= cloud.o-forge.io/core/oc-lib v0.0.0-20250218115549-81d3406305c5 h1:DP/XYrxSOc5ORMGvVNqTvFjxLF4cymUW/d3HIZXKDEk= cloud.o-forge.io/core/oc-lib v0.0.0-20250218115549-81d3406305c5/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE= +cloud.o-forge.io/core/oc-lib v0.0.0-20250218130229-7c30633bded0 h1:3EsRmeTz6OWHJETrPObctnGF8WgZtXHfwL2cjyHcfOk= +cloud.o-forge.io/core/oc-lib v0.0.0-20250218130229-7c30633bded0/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE= +cloud.o-forge.io/core/oc-lib v0.0.0-20250219075511-241c6a5a0861 h1:XqTFKSZ8hXGCJbuu/SBwakpftevg1AKV7hDI50cXNUg= +cloud.o-forge.io/core/oc-lib v0.0.0-20250219075511-241c6a5a0861/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE= +cloud.o-forge.io/core/oc-lib v0.0.0-20250219100312-b4a176667754 h1:7J5EUe/iNS6cT6KVDklpgGH7ak30iEFgWJDEPF6wik4= +cloud.o-forge.io/core/oc-lib v0.0.0-20250219100312-b4a176667754/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE= +cloud.o-forge.io/core/oc-lib v0.0.0-20250219104152-3ecb0e9d960b h1:DhRqJdw2VePaYVlsh8OUA3zl+76Q0FWwGu+a+3aOf6s= +cloud.o-forge.io/core/oc-lib v0.0.0-20250219104152-3ecb0e9d960b/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/beego/beego/v2 v2.3.4 h1:HurQEOGIEhLlPFCTR6ZDuQkybrUl2Ag2i6CdVD2rGiI= github.com/beego/beego/v2 v2.3.4/go.mod h1:5cqHsOHJIxkq44tBpRvtDe59GuVRVv/9/tyVDxd5ce4=