diff --git a/contrib/local-environment/dex.yaml b/contrib/local-environment/dex.yaml index fd64152b..f0a2ead4 100644 --- a/contrib/local-environment/dex.yaml +++ b/contrib/local-environment/dex.yaml @@ -1,7 +1,7 @@ # This configuration is intended to be used with the docker-compose testing # environment. -# This should configure Dex to run on port 4190 and provides a static login -issuer: http://dex.localtest.me:4190/dex +# This should configure Dex to run on port 5556 and provides a static login +issuer: http://dex.localtest.me:5556/dex storage: type: etcd config: @@ -9,7 +9,7 @@ storage: - http://etcd:2379 namespace: dex/ web: - http: 0.0.0.0:4190 + http: 0.0.0.0:5556 oauth2: skipApprovalScreen: true expiry: diff --git a/contrib/local-environment/docker-compose-gitea.yaml b/contrib/local-environment/docker-compose-gitea.yaml index 454d0123..c3236084 100644 --- a/contrib/local-environment/docker-compose-gitea.yaml +++ b/contrib/local-environment/docker-compose-gitea.yaml @@ -34,12 +34,9 @@ services: container_name: httpbin image: kennethreitz/httpbin:latest hostname: httpbin - ports: - - 8080:80 + ports: [] networks: - httpbin: - aliases: - - httpbin.localtest.me + httpbin: {} gitea: image: gitea/gitea:1.24.3 diff --git a/contrib/local-environment/docker-compose-keycloak.yaml b/contrib/local-environment/docker-compose-keycloak.yaml index 3a5a3914..66a2d011 100644 --- a/contrib/local-environment/docker-compose-keycloak.yaml +++ b/contrib/local-environment/docker-compose-keycloak.yaml @@ -34,12 +34,9 @@ services: container_name: httpbin image: kennethreitz/httpbin:latest hostname: httpbin - ports: - - 8080:80/tcp + ports: [] networks: - httpbin: - aliases: - - httpbin.localtest.me + httpbin: {} keycloak: container_name: keycloak diff --git a/contrib/local-environment/docker-compose-nginx.yaml b/contrib/local-environment/docker-compose-nginx.yaml index 45dcad84..72f9d97a 100644 --- a/contrib/local-environment/docker-compose-nginx.yaml +++ b/contrib/local-environment/docker-compose-nginx.yaml @@ -62,7 +62,7 @@ services: - "./dex.yaml:/dex.yaml" restart: unless-stopped ports: - - 4190:4190/tcp + - 5556:4181/tcp networks: dex: aliases: @@ -73,12 +73,9 @@ services: httpbin: container_name: httpbin image: kennethreitz/httpbin - ports: - - 8080:80/tcp + ports: [] networks: - httpbin: - aliases: - - httpbin.localtest.me + httpbin: {} etcd: container_name: etcd image: gcr.io/etcd-development/etcd:v3.6.2 diff --git a/contrib/local-environment/docker-compose.yaml b/contrib/local-environment/docker-compose.yaml index d79ee292..3da4a9a6 100644 --- a/contrib/local-environment/docker-compose.yaml +++ b/contrib/local-environment/docker-compose.yaml @@ -36,7 +36,7 @@ services: - "./dex.yaml:/dex.yaml" restart: unless-stopped ports: - - 4190:4190/tcp + - 5556:4181/tcp networks: dex: aliases: @@ -47,12 +47,9 @@ services: httpbin: container_name: httpbin image: kennethreitz/httpbin - ports: - - 8080:80/tcp + ports: [] networks: - httpbin: - aliases: - - httpbin.localtest.me + httpbin: {} etcd: container_name: etcd image: gcr.io/etcd-development/etcd:v3.6.2 diff --git a/contrib/local-environment/oauth2-proxy-alpha-config.yaml b/contrib/local-environment/oauth2-proxy-alpha-config.yaml index 6a46e1b1..b2c9f6a8 100644 --- a/contrib/local-environment/oauth2-proxy-alpha-config.yaml +++ b/contrib/local-environment/oauth2-proxy-alpha-config.yaml @@ -20,4 +20,4 @@ providers: clientSecret: b2F1dGgyLXByb3h5LWNsaWVudC1zZWNyZXQK clientID: oauth2-proxy oidcConfig: - issuerURL: http://dex.localhost:4190/dex + issuerURL: http://dex.localhost:5556/dex diff --git a/contrib/local-environment/oauth2-proxy-keycloak.cfg b/contrib/local-environment/oauth2-proxy-keycloak.cfg index 391ad331..8491b286 100644 --- a/contrib/local-environment/oauth2-proxy-keycloak.cfg +++ b/contrib/local-environment/oauth2-proxy-keycloak.cfg @@ -3,7 +3,7 @@ cookie_secret="OQINaROshtE9TcZkNAm-5Zs2Pv3xaWytBmc5W7sPX7w=" email_domains="example.com" cookie_secure="false" upstreams="http://httpbin" -cookie_domains=["oauth2-proxy.localtest.me:4080", "httpbin.localtest.me:8080", "keycloak.localtest.me:9080"] # Required so cookie can be read on all subdomains. +cookie_domains=["oauth2-proxy.localtest.me:4080", "keycloak.localtest.me:9080"] # Required so cookie can be read on all subdomains. whitelist_domains=[".localtest.me"] # Required to allow redirection back to original requested target. # keycloak provider diff --git a/contrib/local-environment/oauth2-proxy-nginx.cfg b/contrib/local-environment/oauth2-proxy-nginx.cfg index e17eb311..01b64a55 100644 --- a/contrib/local-environment/oauth2-proxy-nginx.cfg +++ b/contrib/local-environment/oauth2-proxy-nginx.cfg @@ -2,7 +2,7 @@ http_address="0.0.0.0:4180" cookie_secret="OQINaROshtE9TcZkNAm-5Zs2Pv3xaWytBmc5W7sPX7w=" provider="oidc" email_domains="example.com" -oidc_issuer_url="http://dex.localtest.me:4190/dex" +oidc_issuer_url="http://dex.localtest.me:5556/dex" client_secret="b2F1dGgyLXByb3h5LWNsaWVudC1zZWNyZXQK" client_id="oauth2-proxy" cookie_secure="false" diff --git a/contrib/local-environment/oauth2-proxy-traefik.cfg b/contrib/local-environment/oauth2-proxy-traefik.cfg index 6357c383..8dce6752 100644 --- a/contrib/local-environment/oauth2-proxy-traefik.cfg +++ b/contrib/local-environment/oauth2-proxy-traefik.cfg @@ -2,7 +2,7 @@ http_address="0.0.0.0:4180" cookie_secret="OQINaROshtE9TcZkNAm-5Zs2Pv3xaWytBmc5W7sPX7w=" provider="oidc" email_domains=["example.com"] -oidc_issuer_url="http://dex.localhost:4190/dex" +oidc_issuer_url="http://dex.localhost:5556/dex" client_secret="b2F1dGgyLXByb3h5LWNsaWVudC1zZWNyZXQK" client_id="oauth2-proxy" cookie_secure="false" @@ -13,7 +13,7 @@ whitelist_domains=".oauth2-proxy.localhost" # Required to allow redirection back # Mandatory option when using oauth2-proxy with traefik reverse_proxy="true" -# Required for traefik with ForwardAuth and static upstream configuration +# Required for traefik with ForwardAuth and static upstream configuration upstreams="static://202" # The following option skip the page requesting the user # to click on a button to be redirected to the identity provider diff --git a/contrib/local-environment/oauth2-proxy.cfg b/contrib/local-environment/oauth2-proxy.cfg index ee58e145..dfa8b341 100644 --- a/contrib/local-environment/oauth2-proxy.cfg +++ b/contrib/local-environment/oauth2-proxy.cfg @@ -2,7 +2,7 @@ http_address="0.0.0.0:4180" cookie_secret="OQINaROshtE9TcZkNAm-5Zs2Pv3xaWytBmc5W7sPX7w=" email_domains="example.com" cookie_secure="false" -upstreams="http://httpbin.localtest.me:8080" +upstreams="http://httpbin" cookie_domains=[".localtest.me"] # Required so cookie can be read on all subdomains. whitelist_domains=[".localtest.me"] # Required to allow redirection back to original requested target. @@ -11,6 +11,6 @@ client_secret="b2F1dGgyLXByb3h5LWNsaWVudC1zZWNyZXQK" client_id="oauth2-proxy" redirect_url="http://oauth2-proxy.localtest.me:4180/oauth2/callback" -oidc_issuer_url="http://dex.localtest.me:4190/dex" +oidc_issuer_url="http://dex.localtest.me:5556/dex" provider="oidc" provider_display_name="Dex" diff --git a/docs/docs/community/contribution.md b/docs/docs/community/contribution.md index 2cd330ac..92255eda 100644 --- a/docs/docs/community/contribution.md +++ b/docs/docs/community/contribution.md @@ -85,5 +85,5 @@ The docker compose setups expose the services with a dynamic reverse DNS resolve - OAuth2-Proxy: http://oauth2-proxy.localtest.me:4180 - Upstream: http://httpbin.localtest.me:8080 -- Dex: http://dex.localtest.me:4190 +- Dex: http://dex.localtest.me:5556 diff --git a/docs/versioned_docs/version-7.10.x/community/contribution.md b/docs/versioned_docs/version-7.10.x/community/contribution.md index 2cd330ac..92255eda 100644 --- a/docs/versioned_docs/version-7.10.x/community/contribution.md +++ b/docs/versioned_docs/version-7.10.x/community/contribution.md @@ -85,5 +85,5 @@ The docker compose setups expose the services with a dynamic reverse DNS resolve - OAuth2-Proxy: http://oauth2-proxy.localtest.me:4180 - Upstream: http://httpbin.localtest.me:8080 -- Dex: http://dex.localtest.me:4190 +- Dex: http://dex.localtest.me:5556