From f1a89de2e7f7ce82ede150217c15ad764fcf14c8 Mon Sep 17 00:00:00 2001 From: Amir Zarrinkafsh Date: Mon, 10 Feb 2020 04:04:28 +1100 Subject: [PATCH] [MISC] Restructure repo folder layout (#628) --- .gitignore | 2 +- README.md | 4 ++-- cmd/authelia-scripts/cmd_ci.go | 16 ++++++------- docs/deployment-production.md | 2 +- internal/suites/BypassAll/docker-compose.yml | 4 ++-- internal/suites/Docker/docker-compose.yml | 4 ++-- internal/suites/DuoPush/docker-compose.yml | 4 ++-- internal/suites/HAProxy/docker-compose.yml | 4 ++-- .../HighAvailability/docker-compose.yml | 2 +- internal/suites/LDAP/docker-compose.yml | 2 +- internal/suites/Mariadb/docker-compose.yml | 4 ++-- internal/suites/NetworkACL/docker-compose.yml | 4 ++-- .../OneFactorDefaultPolicy/docker-compose.yml | 4 ++-- internal/suites/Postgres/docker-compose.yml | 4 ++-- .../suites/ShortTimeouts/docker-compose.yml | 4 ++-- internal/suites/Standalone/docker-compose.yml | 4 ++-- internal/suites/Traefik/docker-compose.yml | 4 ++-- internal/suites/Traefik2/docker-compose.yml | 4 ++-- .../suites/docker-compose.yml | 0 internal/suites/docker.go | 4 ++-- .../compose/authelia/Dockerfile.backend | 0 .../compose/authelia/Dockerfile.frontend | 0 .../authelia/docker-compose.backend.dev.yml | 0 .../authelia/docker-compose.backend.dist.yml | 0 .../authelia/docker-compose.frontend.dev.yml | 0 .../authelia/docker-compose.frontend.dist.yml | 0 .../authelia/resources/entrypoint-backend.sh | 0 .../authelia/resources/entrypoint-frontend.sh | 0 .../compose/authelia/resources/nginx.conf | 0 .../compose/authelia/resources/reflex.conf | 0 .../authelia/resources/run-backend-dev.sh | 0 .../example}/compose/duo-api/Dockerfile | 0 .../compose/duo-api/docker-compose.yml | 0 .../example}/compose/duo-api/duo_api.js | 0 .../example}/compose/duo-api/duo_client.js | 0 .../compose/duo-api/package-lock.json | 0 .../example}/compose/duo-api/package.json | 0 .../example}/compose/haproxy/Dockerfile | 0 .../compose/haproxy/docker-compose.yml | 0 .../example}/compose/haproxy/haproxy.cfg | 0 .../compose/httpbin/docker-compose.yml | 0 .../suites/example}/compose/kind/Dockerfile | 0 .../suites/example}/compose/kind/config.yml | 0 .../example}/compose/kind/docker-compose.yml | 0 .../compose/kind/entrypoint-dashboard.sh | 0 .../example}/compose/kind/entrypoint.sh | 0 .../example}/compose/kind/patch-kubeconfig.sh | 0 .../compose/ldap/docker-compose.admin.yml | 0 .../example}/compose/ldap/docker-compose.yml | 0 .../example}/compose/ldap/ldif/access.rules | 0 .../example}/compose/ldap/ldif/base.ldif | 0 .../compose/mariadb/docker-compose.yml | 0 .../example}/compose/nginx/backend/Dockerfile | 0 .../compose/nginx/backend/docker-compose.yml | 2 +- .../nginx/backend/html/admin/secret.html | 0 .../backend/html/dev/groups/admin/secret.html | 0 .../backend/html/dev/groups/dev/secret.html | 0 .../backend/html/dev/users/bob/secret.html | 0 .../backend/html/dev/users/harry/secret.html | 0 .../backend/html/dev/users/john/secret.html | 0 .../nginx/backend/html/home/index.html | 0 .../compose/nginx/backend/html/icon.png | Bin .../nginx/backend/html/mail/secret.html | 0 .../nginx/backend/html/public/index.html | 0 .../nginx/backend/html/public/secret.html | 0 .../nginx/backend/html/secure/index.html | 0 .../nginx/backend/html/secure/secret.html | 0 .../backend/html/singlefactor/secret.html | 0 .../example}/compose/nginx/backend/nginx.conf | 0 .../compose/nginx/portal/docker-compose.yml | 0 .../example}/compose/nginx/portal/nginx.conf | 0 .../compose/nginx/portal/ssl/server.cert | 0 .../compose/nginx/portal/ssl/server.key | 0 .../compose/postgres/docker-compose.yml | 0 .../example}/compose/redis/docker-compose.yml | 0 .../example}/compose/smtp/docker-compose.yml | 0 .../example}/compose/squid/docker-compose.yml | 0 .../suites/example}/compose/squid/squid.conf | 0 .../compose/traefik/docker-compose.yml | 0 .../compose/traefik2/docker-compose.yml | 0 .../suites/example}/kube/README.md | 2 +- .../suites/example}/kube/apps/apps.yml | 0 .../suites/example}/kube/apps/ssl/server.cert | 0 .../suites/example}/kube/apps/ssl/server.key | 0 .../kube/authelia/configs/configuration.yml | 0 .../example}/kube/authelia/deployment.yml | 0 .../suites/example}/kube/authelia/ingress.yml | 0 .../suites/example}/kube/authelia/service.yml | 0 .../example}/kube/bootstrap-authelia.sh | 0 .../example}/kube/bootstrap-dashboard.sh | 0 .../suites/example}/kube/bootstrap.sh | 0 .../suites/example}/kube/dashboard.yml | 0 .../kube/ingress-controller/deployment.yml | 0 .../example}/kube/ingress-controller/rbac.yml | 0 .../kube/ingress-controller/service.yml | 0 .../suites/example}/kube/ldap/access.rules | 0 .../suites/example}/kube/ldap/base.ldif | 0 .../suites/example}/kube/ldap/deployment.yml | 0 .../suites/example}/kube/ldap/service.yml | 0 .../suites/example}/kube/mail/deployment.yml | 0 .../suites/example}/kube/mail/ingress.yml | 0 .../suites/example}/kube/mail/service.yml | 0 .../suites/example}/kube/namespace.yml | 0 .../suites/example}/kube/storage/mariadb.yml | 0 .../suites/example}/kube/storage/redis.yml | 0 .../suites/example}/kube/test.yml | 0 .../suites/example}/swarm/docker-compose.yml | 0 internal/suites/kubernetes.go | 10 ++++---- internal/suites/suite_bypass_all.go | 16 ++++++------- internal/suites/suite_docker.go | 12 +++++----- internal/suites/suite_duo_push.go | 12 +++++----- internal/suites/suite_haproxy.go | 12 +++++----- internal/suites/suite_high_availability.go | 22 +++++++++--------- internal/suites/suite_kubernetes.go | 4 ++-- internal/suites/suite_ldap.go | 16 ++++++------- internal/suites/suite_mariadb.go | 16 ++++++------- internal/suites/suite_network_acl.go | 16 ++++++------- .../suites/suite_one_factor_default_policy.go | 10 ++++---- internal/suites/suite_postgres.go | 16 ++++++------- internal/suites/suite_short_timeouts.go | 12 +++++----- internal/suites/suite_standalone.go | 12 +++++----- internal/suites/suite_traefik.go | 12 +++++----- internal/suites/suite_traefik2.go | 12 +++++----- 123 files changed, 147 insertions(+), 147 deletions(-) rename docker-compose.yml => internal/suites/docker-compose.yml (100%) rename {example => internal/suites/example}/compose/authelia/Dockerfile.backend (100%) rename {example => internal/suites/example}/compose/authelia/Dockerfile.frontend (100%) rename {example => internal/suites/example}/compose/authelia/docker-compose.backend.dev.yml (100%) rename {example => internal/suites/example}/compose/authelia/docker-compose.backend.dist.yml (100%) rename {example => internal/suites/example}/compose/authelia/docker-compose.frontend.dev.yml (100%) rename {example => internal/suites/example}/compose/authelia/docker-compose.frontend.dist.yml (100%) rename {example => internal/suites/example}/compose/authelia/resources/entrypoint-backend.sh (100%) rename {example => internal/suites/example}/compose/authelia/resources/entrypoint-frontend.sh (100%) rename {example => internal/suites/example}/compose/authelia/resources/nginx.conf (100%) rename {example => internal/suites/example}/compose/authelia/resources/reflex.conf (100%) rename {example => internal/suites/example}/compose/authelia/resources/run-backend-dev.sh (100%) rename {example => internal/suites/example}/compose/duo-api/Dockerfile (100%) rename {example => internal/suites/example}/compose/duo-api/docker-compose.yml (100%) rename {example => internal/suites/example}/compose/duo-api/duo_api.js (100%) rename {example => internal/suites/example}/compose/duo-api/duo_client.js (100%) rename {example => internal/suites/example}/compose/duo-api/package-lock.json (100%) rename {example => internal/suites/example}/compose/duo-api/package.json (100%) rename {example => internal/suites/example}/compose/haproxy/Dockerfile (100%) rename {example => internal/suites/example}/compose/haproxy/docker-compose.yml (100%) rename {example => internal/suites/example}/compose/haproxy/haproxy.cfg (100%) rename {example => internal/suites/example}/compose/httpbin/docker-compose.yml (100%) rename {example => internal/suites/example}/compose/kind/Dockerfile (100%) rename {example => internal/suites/example}/compose/kind/config.yml (100%) rename {example => internal/suites/example}/compose/kind/docker-compose.yml (100%) rename {example => internal/suites/example}/compose/kind/entrypoint-dashboard.sh (100%) rename {example => internal/suites/example}/compose/kind/entrypoint.sh (100%) rename {example => internal/suites/example}/compose/kind/patch-kubeconfig.sh (100%) rename {example => internal/suites/example}/compose/ldap/docker-compose.admin.yml (100%) rename {example => internal/suites/example}/compose/ldap/docker-compose.yml (100%) rename {example => internal/suites/example}/compose/ldap/ldif/access.rules (100%) rename {example => internal/suites/example}/compose/ldap/ldif/base.ldif (100%) rename {example => internal/suites/example}/compose/mariadb/docker-compose.yml (100%) rename {example => internal/suites/example}/compose/nginx/backend/Dockerfile (100%) rename {example => internal/suites/example}/compose/nginx/backend/docker-compose.yml (94%) rename {example => internal/suites/example}/compose/nginx/backend/html/admin/secret.html (100%) rename {example => internal/suites/example}/compose/nginx/backend/html/dev/groups/admin/secret.html (100%) rename {example => internal/suites/example}/compose/nginx/backend/html/dev/groups/dev/secret.html (100%) rename {example => internal/suites/example}/compose/nginx/backend/html/dev/users/bob/secret.html (100%) rename {example => internal/suites/example}/compose/nginx/backend/html/dev/users/harry/secret.html (100%) rename {example => internal/suites/example}/compose/nginx/backend/html/dev/users/john/secret.html (100%) rename {example => internal/suites/example}/compose/nginx/backend/html/home/index.html (100%) rename {example => internal/suites/example}/compose/nginx/backend/html/icon.png (100%) rename {example => internal/suites/example}/compose/nginx/backend/html/mail/secret.html (100%) rename {example => internal/suites/example}/compose/nginx/backend/html/public/index.html (100%) rename {example => internal/suites/example}/compose/nginx/backend/html/public/secret.html (100%) rename {example => internal/suites/example}/compose/nginx/backend/html/secure/index.html (100%) rename {example => internal/suites/example}/compose/nginx/backend/html/secure/secret.html (100%) rename {example => internal/suites/example}/compose/nginx/backend/html/singlefactor/secret.html (100%) rename {example => internal/suites/example}/compose/nginx/backend/nginx.conf (100%) rename {example => internal/suites/example}/compose/nginx/portal/docker-compose.yml (100%) rename {example => internal/suites/example}/compose/nginx/portal/nginx.conf (100%) rename {example => internal/suites/example}/compose/nginx/portal/ssl/server.cert (100%) rename {example => internal/suites/example}/compose/nginx/portal/ssl/server.key (100%) rename {example => internal/suites/example}/compose/postgres/docker-compose.yml (100%) rename {example => internal/suites/example}/compose/redis/docker-compose.yml (100%) rename {example => internal/suites/example}/compose/smtp/docker-compose.yml (100%) rename {example => internal/suites/example}/compose/squid/docker-compose.yml (100%) rename {example => internal/suites/example}/compose/squid/squid.conf (100%) rename {example => internal/suites/example}/compose/traefik/docker-compose.yml (100%) rename {example => internal/suites/example}/compose/traefik2/docker-compose.yml (100%) rename {example => internal/suites/example}/kube/README.md (99%) rename {example => internal/suites/example}/kube/apps/apps.yml (100%) rename {example => internal/suites/example}/kube/apps/ssl/server.cert (100%) rename {example => internal/suites/example}/kube/apps/ssl/server.key (100%) rename {example => internal/suites/example}/kube/authelia/configs/configuration.yml (100%) rename {example => internal/suites/example}/kube/authelia/deployment.yml (100%) rename {example => internal/suites/example}/kube/authelia/ingress.yml (100%) rename {example => internal/suites/example}/kube/authelia/service.yml (100%) rename {example => internal/suites/example}/kube/bootstrap-authelia.sh (100%) rename {example => internal/suites/example}/kube/bootstrap-dashboard.sh (100%) rename {example => internal/suites/example}/kube/bootstrap.sh (100%) rename {example => internal/suites/example}/kube/dashboard.yml (100%) rename {example => internal/suites/example}/kube/ingress-controller/deployment.yml (100%) rename {example => internal/suites/example}/kube/ingress-controller/rbac.yml (100%) rename {example => internal/suites/example}/kube/ingress-controller/service.yml (100%) rename {example => internal/suites/example}/kube/ldap/access.rules (100%) rename {example => internal/suites/example}/kube/ldap/base.ldif (100%) rename {example => internal/suites/example}/kube/ldap/deployment.yml (100%) rename {example => internal/suites/example}/kube/ldap/service.yml (100%) rename {example => internal/suites/example}/kube/mail/deployment.yml (100%) rename {example => internal/suites/example}/kube/mail/ingress.yml (100%) rename {example => internal/suites/example}/kube/mail/service.yml (100%) rename {example => internal/suites/example}/kube/namespace.yml (100%) rename {example => internal/suites/example}/kube/storage/mariadb.yml (100%) rename {example => internal/suites/example}/kube/storage/redis.yml (100%) rename {example => internal/suites/example}/kube/test.yml (100%) rename {example => internal/suites/example}/swarm/docker-compose.yml (100%) diff --git a/.gitignore b/.gitignore index 0ecad1b93..c069b6688 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,7 @@ dist/ /config.yml /config.test.yml -example/ldap/private.ldif +internal/suites/example/ldap/private.ldif Configuration.schema.json diff --git a/README.md b/README.md index 58154cba1..55d7871d0 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,14 @@ [![Build](https://img.shields.io/buildkite/d6543d3ece3433f46dbe5fd9fcfaf1f68a6dbc48eb1048bc22/master?style=flat-square&color=brightgreen)](https://buildkite.com/authelia/authelia) - [![Go Report Card](https://goreportcard.com/badge/github.com/authelia/authelia)](https://goreportcard.com/report/github.com/authelia/authelia) + [![Go Report Card](https://goreportcard.com/badge/github.com/authelia/authelia?style=flat-square)](https://goreportcard.com/report/github.com/authelia/authelia) [![Docker Tag](https://images.microbadger.com/badges/version/authelia/authelia.svg)](https://microbadger.com/images/authelia/authelia) [![Docker Size](https://img.shields.io/microbadger/image-size/authelia/authelia?logo=docker&style=flat-square&color=blue)](https://microbadger.com/images/authelia/authelia) [![GitHub Release](https://img.shields.io/github/release/authelia/authelia.svg?logo=github&style=flat-square&color=blue)](https://github.com/authelia/authelia/releases) [![AUR source version](https://img.shields.io/aur/version/authelia?logo=arch-linux&label=authelia&style=flat-square&color=blue)](https://aur.archlinux.org/packages/authelia/) [![AUR binary version](https://img.shields.io/aur/version/authelia-bin?logo=arch-linux&label=authelia-bin&style=flat-square&color=blue)](https://aur.archlinux.org/packages/authelia-bin/) [![AUR development version](https://img.shields.io/aur/version/authelia-git?logo=arch-linux&label=authelia-git&style=flat-square&color=blue)](https://aur.archlinux.org/packages/authelia-git/) - [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat-square)][Apache 2.0] + [![License](https://img.shields.io/github/license/authelia/authelia?style=flat-square&color=blue)][Apache 2.0] [![Sponsor](https://img.shields.io/badge/donate-opencollective-blue.svg?style=flat-square)](https://opencollective.com/authelia-sponsors) [![Matrix](https://img.shields.io/matrix/authelia:matrix.org?logo=matrix&style=flat-square&color=blue)](https://riot.im/app/#/room/#authelia:matrix.org) diff --git a/cmd/authelia-scripts/cmd_ci.go b/cmd/authelia-scripts/cmd_ci.go index 2fb0dad4f..c09af3774 100644 --- a/cmd/authelia-scripts/cmd_ci.go +++ b/cmd/authelia-scripts/cmd_ci.go @@ -6,14 +6,14 @@ import ( "github.com/spf13/cobra" ) -const dockerPullCommandLine = "docker-compose -f docker-compose.yml " + - "-f example/compose/mariadb/docker-compose.yml " + - "-f example/compose/redis/docker-compose.yml " + - "-f example/compose/nginx/portal/docker-compose.yml " + - "-f example/compose/smtp/docker-compose.yml " + - "-f example/compose/httpbin/docker-compose.yml " + - "-f example/compose/ldap/docker-compose.admin.yml " + - "-f example/compose/ldap/docker-compose.yml " + +const dockerPullCommandLine = "docker-compose -p authelia -f internal/suites/docker-compose.yml " + + "-f internal/suites/example/compose/mariadb/docker-compose.yml " + + "-f internal/suites/example/compose/redis/docker-compose.yml " + + "-f internal/suites/example/compose/nginx/portal/docker-compose.yml " + + "-f internal/suites/example/compose/smtp/docker-compose.yml " + + "-f internal/suites/example/compose/httpbin/docker-compose.yml " + + "-f internal/suites/example/compose/ldap/docker-compose.admin.yml " + + "-f internal/suites/example/compose/ldap/docker-compose.yml " + "pull" // RunCI run the CI scripts diff --git a/docs/deployment-production.md b/docs/deployment-production.md index edaef099b..82ab9d6cf 100644 --- a/docs/deployment-production.md +++ b/docs/deployment-production.md @@ -49,7 +49,7 @@ pay attention to the permissions of the configuration file. See **Authelia** can also be installed on top of [Kubernetes] using [nginx ingress controller](https://github.com/kubernetes/ingress-nginx). -Please refer to the following [documentation](../example/kube/README.md) +Please refer to the following [documentation](../internal/suites/example/kube/README.md) for more information. ## FAQ diff --git a/internal/suites/BypassAll/docker-compose.yml b/internal/suites/BypassAll/docker-compose.yml index 396690ac9..86f168e90 100644 --- a/internal/suites/BypassAll/docker-compose.yml +++ b/internal/suites/BypassAll/docker-compose.yml @@ -2,5 +2,5 @@ version: '3' services: authelia-backend: volumes: - - './internal/suites/BypassAll/configuration.yml:/etc/authelia/configuration.yml:ro' - - './internal/suites/BypassAll/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file + - './BypassAll/configuration.yml:/etc/authelia/configuration.yml:ro' + - './BypassAll/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file diff --git a/internal/suites/Docker/docker-compose.yml b/internal/suites/Docker/docker-compose.yml index 8a35da275..e0ae05ac2 100644 --- a/internal/suites/Docker/docker-compose.yml +++ b/internal/suites/Docker/docker-compose.yml @@ -2,5 +2,5 @@ version: '3' services: authelia-backend: volumes: - - './internal/suites/Docker/configuration.yml:/etc/authelia/configuration.yml:ro' - - './internal/suites/Docker/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file + - './Docker/configuration.yml:/etc/authelia/configuration.yml:ro' + - './Docker/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file diff --git a/internal/suites/DuoPush/docker-compose.yml b/internal/suites/DuoPush/docker-compose.yml index e3fa0ae7f..1b7ae866f 100644 --- a/internal/suites/DuoPush/docker-compose.yml +++ b/internal/suites/DuoPush/docker-compose.yml @@ -2,5 +2,5 @@ version: '3' services: authelia-backend: volumes: - - './internal/suites/DuoPush/configuration.yml:/etc/authelia/configuration.yml:ro' - - './internal/suites/DuoPush/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file + - './DuoPush/configuration.yml:/etc/authelia/configuration.yml:ro' + - './DuoPush/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file diff --git a/internal/suites/HAProxy/docker-compose.yml b/internal/suites/HAProxy/docker-compose.yml index 9ca7579df..b4bf96689 100644 --- a/internal/suites/HAProxy/docker-compose.yml +++ b/internal/suites/HAProxy/docker-compose.yml @@ -2,5 +2,5 @@ version: '3' services: authelia-backend: volumes: - - './internal/suites/HAProxy/configuration.yml:/etc/authelia/configuration.yml:ro' - - './internal/suites/HAProxy/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file + - './HAProxy/configuration.yml:/etc/authelia/configuration.yml:ro' + - './HAProxy/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file diff --git a/internal/suites/HighAvailability/docker-compose.yml b/internal/suites/HighAvailability/docker-compose.yml index 8fc1809ad..2961f3259 100644 --- a/internal/suites/HighAvailability/docker-compose.yml +++ b/internal/suites/HighAvailability/docker-compose.yml @@ -2,4 +2,4 @@ version: '3' services: authelia-backend: volumes: - - './internal/suites/HighAvailability/configuration.yml:/etc/authelia/configuration.yml:ro' \ No newline at end of file + - './HighAvailability/configuration.yml:/etc/authelia/configuration.yml:ro' \ No newline at end of file diff --git a/internal/suites/LDAP/docker-compose.yml b/internal/suites/LDAP/docker-compose.yml index 615b772ef..5f0e55b4a 100644 --- a/internal/suites/LDAP/docker-compose.yml +++ b/internal/suites/LDAP/docker-compose.yml @@ -2,4 +2,4 @@ version: '3' services: authelia-backend: volumes: - - './internal/suites/LDAP/configuration.yml:/etc/authelia/configuration.yml:ro' \ No newline at end of file + - './LDAP/configuration.yml:/etc/authelia/configuration.yml:ro' \ No newline at end of file diff --git a/internal/suites/Mariadb/docker-compose.yml b/internal/suites/Mariadb/docker-compose.yml index 12ba4768b..ae7891ec5 100644 --- a/internal/suites/Mariadb/docker-compose.yml +++ b/internal/suites/Mariadb/docker-compose.yml @@ -2,5 +2,5 @@ version: '3' services: authelia-backend: volumes: - - './internal/suites/Mariadb/configuration.yml:/etc/authelia/configuration.yml:ro' - - './internal/suites/Mariadb/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file + - './Mariadb/configuration.yml:/etc/authelia/configuration.yml:ro' + - './Mariadb/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file diff --git a/internal/suites/NetworkACL/docker-compose.yml b/internal/suites/NetworkACL/docker-compose.yml index a5fddc1cd..c96df73b4 100644 --- a/internal/suites/NetworkACL/docker-compose.yml +++ b/internal/suites/NetworkACL/docker-compose.yml @@ -2,5 +2,5 @@ version: '3' services: authelia-backend: volumes: - - './internal/suites/NetworkACL/configuration.yml:/etc/authelia/configuration.yml:ro' - - './internal/suites/NetworkACL/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file + - './NetworkACL/configuration.yml:/etc/authelia/configuration.yml:ro' + - './NetworkACL/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file diff --git a/internal/suites/OneFactorDefaultPolicy/docker-compose.yml b/internal/suites/OneFactorDefaultPolicy/docker-compose.yml index ae1447aa1..cdbf8f05f 100644 --- a/internal/suites/OneFactorDefaultPolicy/docker-compose.yml +++ b/internal/suites/OneFactorDefaultPolicy/docker-compose.yml @@ -2,5 +2,5 @@ version: '3' services: authelia-backend: volumes: - - './internal/suites/OneFactorDefaultPolicy/configuration.yml:/etc/authelia/configuration.yml:ro' - - './internal/suites/OneFactorDefaultPolicy/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file + - './OneFactorDefaultPolicy/configuration.yml:/etc/authelia/configuration.yml:ro' + - './OneFactorDefaultPolicy/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file diff --git a/internal/suites/Postgres/docker-compose.yml b/internal/suites/Postgres/docker-compose.yml index 6d58620cc..19720e362 100644 --- a/internal/suites/Postgres/docker-compose.yml +++ b/internal/suites/Postgres/docker-compose.yml @@ -2,5 +2,5 @@ version: '3' services: authelia-backend: volumes: - - './internal/suites/Postgres/configuration.yml:/etc/authelia/configuration.yml:ro' - - './internal/suites/Postgres/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file + - './Postgres/configuration.yml:/etc/authelia/configuration.yml:ro' + - './Postgres/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file diff --git a/internal/suites/ShortTimeouts/docker-compose.yml b/internal/suites/ShortTimeouts/docker-compose.yml index 59db5164f..5402c5618 100644 --- a/internal/suites/ShortTimeouts/docker-compose.yml +++ b/internal/suites/ShortTimeouts/docker-compose.yml @@ -2,5 +2,5 @@ version: '3' services: authelia-backend: volumes: - - './internal/suites/ShortTimeouts/configuration.yml:/etc/authelia/configuration.yml:ro' - - './internal/suites/ShortTimeouts/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file + - './ShortTimeouts/configuration.yml:/etc/authelia/configuration.yml:ro' + - './ShortTimeouts/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file diff --git a/internal/suites/Standalone/docker-compose.yml b/internal/suites/Standalone/docker-compose.yml index f05e8656b..1371738db 100644 --- a/internal/suites/Standalone/docker-compose.yml +++ b/internal/suites/Standalone/docker-compose.yml @@ -5,7 +5,7 @@ services: - AUTHELIA_JWT_SECRET=very_important_secret - AUTHELIA_SESSION_SECRET=unsecure_session_secret volumes: - - './internal/suites/Standalone/configuration.yml:/etc/authelia/configuration.yml:ro' - - './internal/suites/Standalone/users.yml:/var/lib/authelia/users.yml' + - './Standalone/configuration.yml:/etc/authelia/configuration.yml:ro' + - './Standalone/users.yml:/var/lib/authelia/users.yml' - '/tmp:/tmp' user: ${USER_ID}:${GROUP_ID} \ No newline at end of file diff --git a/internal/suites/Traefik/docker-compose.yml b/internal/suites/Traefik/docker-compose.yml index 6666a295a..212e2d017 100644 --- a/internal/suites/Traefik/docker-compose.yml +++ b/internal/suites/Traefik/docker-compose.yml @@ -2,5 +2,5 @@ version: '3' services: authelia-backend: volumes: - - './internal/suites/Traefik/configuration.yml:/etc/authelia/configuration.yml:ro' - - './internal/suites/Traefik/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file + - './Traefik/configuration.yml:/etc/authelia/configuration.yml:ro' + - './Traefik/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file diff --git a/internal/suites/Traefik2/docker-compose.yml b/internal/suites/Traefik2/docker-compose.yml index ff68f5f0c..14d2c68bd 100644 --- a/internal/suites/Traefik2/docker-compose.yml +++ b/internal/suites/Traefik2/docker-compose.yml @@ -2,5 +2,5 @@ version: '3' services: authelia-backend: volumes: - - './internal/suites/Traefik2/configuration.yml:/etc/authelia/configuration.yml:ro' - - './internal/suites/Traefik2/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file + - './Traefik2/configuration.yml:/etc/authelia/configuration.yml:ro' + - './Traefik2/users.yml:/var/lib/authelia/users.yml' \ No newline at end of file diff --git a/docker-compose.yml b/internal/suites/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to internal/suites/docker-compose.yml diff --git a/internal/suites/docker.go b/internal/suites/docker.go index 2a90ba16b..64879edc4 100644 --- a/internal/suites/docker.go +++ b/internal/suites/docker.go @@ -30,13 +30,13 @@ func NewDockerEnvironment(files []string) *DockerEnvironment { } func (de *DockerEnvironment) createCommandWithStdout(cmd string) *exec.Cmd { - dockerCmdLine := fmt.Sprintf("docker-compose -f %s %s", strings.Join(de.dockerComposeFiles, " -f "), cmd) + dockerCmdLine := fmt.Sprintf("docker-compose -p authelia -f %s %s", strings.Join(de.dockerComposeFiles, " -f "), cmd) log.Trace(dockerCmdLine) return utils.CommandWithStdout("bash", "-c", dockerCmdLine) } func (de *DockerEnvironment) createCommand(cmd string) *exec.Cmd { - dockerCmdLine := fmt.Sprintf("docker-compose -f %s %s", strings.Join(de.dockerComposeFiles, " -f "), cmd) + dockerCmdLine := fmt.Sprintf("docker-compose -p authelia -f %s %s", strings.Join(de.dockerComposeFiles, " -f "), cmd) log.Trace(dockerCmdLine) return utils.Command("bash", "-c", dockerCmdLine) } diff --git a/example/compose/authelia/Dockerfile.backend b/internal/suites/example/compose/authelia/Dockerfile.backend similarity index 100% rename from example/compose/authelia/Dockerfile.backend rename to internal/suites/example/compose/authelia/Dockerfile.backend diff --git a/example/compose/authelia/Dockerfile.frontend b/internal/suites/example/compose/authelia/Dockerfile.frontend similarity index 100% rename from example/compose/authelia/Dockerfile.frontend rename to internal/suites/example/compose/authelia/Dockerfile.frontend diff --git a/example/compose/authelia/docker-compose.backend.dev.yml b/internal/suites/example/compose/authelia/docker-compose.backend.dev.yml similarity index 100% rename from example/compose/authelia/docker-compose.backend.dev.yml rename to internal/suites/example/compose/authelia/docker-compose.backend.dev.yml diff --git a/example/compose/authelia/docker-compose.backend.dist.yml b/internal/suites/example/compose/authelia/docker-compose.backend.dist.yml similarity index 100% rename from example/compose/authelia/docker-compose.backend.dist.yml rename to internal/suites/example/compose/authelia/docker-compose.backend.dist.yml diff --git a/example/compose/authelia/docker-compose.frontend.dev.yml b/internal/suites/example/compose/authelia/docker-compose.frontend.dev.yml similarity index 100% rename from example/compose/authelia/docker-compose.frontend.dev.yml rename to internal/suites/example/compose/authelia/docker-compose.frontend.dev.yml diff --git a/example/compose/authelia/docker-compose.frontend.dist.yml b/internal/suites/example/compose/authelia/docker-compose.frontend.dist.yml similarity index 100% rename from example/compose/authelia/docker-compose.frontend.dist.yml rename to internal/suites/example/compose/authelia/docker-compose.frontend.dist.yml diff --git a/example/compose/authelia/resources/entrypoint-backend.sh b/internal/suites/example/compose/authelia/resources/entrypoint-backend.sh similarity index 100% rename from example/compose/authelia/resources/entrypoint-backend.sh rename to internal/suites/example/compose/authelia/resources/entrypoint-backend.sh diff --git a/example/compose/authelia/resources/entrypoint-frontend.sh b/internal/suites/example/compose/authelia/resources/entrypoint-frontend.sh similarity index 100% rename from example/compose/authelia/resources/entrypoint-frontend.sh rename to internal/suites/example/compose/authelia/resources/entrypoint-frontend.sh diff --git a/example/compose/authelia/resources/nginx.conf b/internal/suites/example/compose/authelia/resources/nginx.conf similarity index 100% rename from example/compose/authelia/resources/nginx.conf rename to internal/suites/example/compose/authelia/resources/nginx.conf diff --git a/example/compose/authelia/resources/reflex.conf b/internal/suites/example/compose/authelia/resources/reflex.conf similarity index 100% rename from example/compose/authelia/resources/reflex.conf rename to internal/suites/example/compose/authelia/resources/reflex.conf diff --git a/example/compose/authelia/resources/run-backend-dev.sh b/internal/suites/example/compose/authelia/resources/run-backend-dev.sh similarity index 100% rename from example/compose/authelia/resources/run-backend-dev.sh rename to internal/suites/example/compose/authelia/resources/run-backend-dev.sh diff --git a/example/compose/duo-api/Dockerfile b/internal/suites/example/compose/duo-api/Dockerfile similarity index 100% rename from example/compose/duo-api/Dockerfile rename to internal/suites/example/compose/duo-api/Dockerfile diff --git a/example/compose/duo-api/docker-compose.yml b/internal/suites/example/compose/duo-api/docker-compose.yml similarity index 100% rename from example/compose/duo-api/docker-compose.yml rename to internal/suites/example/compose/duo-api/docker-compose.yml diff --git a/example/compose/duo-api/duo_api.js b/internal/suites/example/compose/duo-api/duo_api.js similarity index 100% rename from example/compose/duo-api/duo_api.js rename to internal/suites/example/compose/duo-api/duo_api.js diff --git a/example/compose/duo-api/duo_client.js b/internal/suites/example/compose/duo-api/duo_client.js similarity index 100% rename from example/compose/duo-api/duo_client.js rename to internal/suites/example/compose/duo-api/duo_client.js diff --git a/example/compose/duo-api/package-lock.json b/internal/suites/example/compose/duo-api/package-lock.json similarity index 100% rename from example/compose/duo-api/package-lock.json rename to internal/suites/example/compose/duo-api/package-lock.json diff --git a/example/compose/duo-api/package.json b/internal/suites/example/compose/duo-api/package.json similarity index 100% rename from example/compose/duo-api/package.json rename to internal/suites/example/compose/duo-api/package.json diff --git a/example/compose/haproxy/Dockerfile b/internal/suites/example/compose/haproxy/Dockerfile similarity index 100% rename from example/compose/haproxy/Dockerfile rename to internal/suites/example/compose/haproxy/Dockerfile diff --git a/example/compose/haproxy/docker-compose.yml b/internal/suites/example/compose/haproxy/docker-compose.yml similarity index 100% rename from example/compose/haproxy/docker-compose.yml rename to internal/suites/example/compose/haproxy/docker-compose.yml diff --git a/example/compose/haproxy/haproxy.cfg b/internal/suites/example/compose/haproxy/haproxy.cfg similarity index 100% rename from example/compose/haproxy/haproxy.cfg rename to internal/suites/example/compose/haproxy/haproxy.cfg diff --git a/example/compose/httpbin/docker-compose.yml b/internal/suites/example/compose/httpbin/docker-compose.yml similarity index 100% rename from example/compose/httpbin/docker-compose.yml rename to internal/suites/example/compose/httpbin/docker-compose.yml diff --git a/example/compose/kind/Dockerfile b/internal/suites/example/compose/kind/Dockerfile similarity index 100% rename from example/compose/kind/Dockerfile rename to internal/suites/example/compose/kind/Dockerfile diff --git a/example/compose/kind/config.yml b/internal/suites/example/compose/kind/config.yml similarity index 100% rename from example/compose/kind/config.yml rename to internal/suites/example/compose/kind/config.yml diff --git a/example/compose/kind/docker-compose.yml b/internal/suites/example/compose/kind/docker-compose.yml similarity index 100% rename from example/compose/kind/docker-compose.yml rename to internal/suites/example/compose/kind/docker-compose.yml diff --git a/example/compose/kind/entrypoint-dashboard.sh b/internal/suites/example/compose/kind/entrypoint-dashboard.sh similarity index 100% rename from example/compose/kind/entrypoint-dashboard.sh rename to internal/suites/example/compose/kind/entrypoint-dashboard.sh diff --git a/example/compose/kind/entrypoint.sh b/internal/suites/example/compose/kind/entrypoint.sh similarity index 100% rename from example/compose/kind/entrypoint.sh rename to internal/suites/example/compose/kind/entrypoint.sh diff --git a/example/compose/kind/patch-kubeconfig.sh b/internal/suites/example/compose/kind/patch-kubeconfig.sh similarity index 100% rename from example/compose/kind/patch-kubeconfig.sh rename to internal/suites/example/compose/kind/patch-kubeconfig.sh diff --git a/example/compose/ldap/docker-compose.admin.yml b/internal/suites/example/compose/ldap/docker-compose.admin.yml similarity index 100% rename from example/compose/ldap/docker-compose.admin.yml rename to internal/suites/example/compose/ldap/docker-compose.admin.yml diff --git a/example/compose/ldap/docker-compose.yml b/internal/suites/example/compose/ldap/docker-compose.yml similarity index 100% rename from example/compose/ldap/docker-compose.yml rename to internal/suites/example/compose/ldap/docker-compose.yml diff --git a/example/compose/ldap/ldif/access.rules b/internal/suites/example/compose/ldap/ldif/access.rules similarity index 100% rename from example/compose/ldap/ldif/access.rules rename to internal/suites/example/compose/ldap/ldif/access.rules diff --git a/example/compose/ldap/ldif/base.ldif b/internal/suites/example/compose/ldap/ldif/base.ldif similarity index 100% rename from example/compose/ldap/ldif/base.ldif rename to internal/suites/example/compose/ldap/ldif/base.ldif diff --git a/example/compose/mariadb/docker-compose.yml b/internal/suites/example/compose/mariadb/docker-compose.yml similarity index 100% rename from example/compose/mariadb/docker-compose.yml rename to internal/suites/example/compose/mariadb/docker-compose.yml diff --git a/example/compose/nginx/backend/Dockerfile b/internal/suites/example/compose/nginx/backend/Dockerfile similarity index 100% rename from example/compose/nginx/backend/Dockerfile rename to internal/suites/example/compose/nginx/backend/Dockerfile diff --git a/example/compose/nginx/backend/docker-compose.yml b/internal/suites/example/compose/nginx/backend/docker-compose.yml similarity index 94% rename from example/compose/nginx/backend/docker-compose.yml rename to internal/suites/example/compose/nginx/backend/docker-compose.yml index b433386b1..e12498d5e 100644 --- a/example/compose/nginx/backend/docker-compose.yml +++ b/internal/suites/example/compose/nginx/backend/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: nginx-backend: build: - context: example/compose/nginx/backend + context: ./example/compose/nginx/backend labels: - 'traefik.frontend.rule=Host:home.example.com,public.example.com,secure.example.com,admin.example.com,singlefactor.example.com' # Traefik 1.x - 'traefik.frontend.auth.forward.address=http://authelia-backend:9091/api/verify?rd=https://login.example.com:8080/' # Traefik 1.x diff --git a/example/compose/nginx/backend/html/admin/secret.html b/internal/suites/example/compose/nginx/backend/html/admin/secret.html similarity index 100% rename from example/compose/nginx/backend/html/admin/secret.html rename to internal/suites/example/compose/nginx/backend/html/admin/secret.html diff --git a/example/compose/nginx/backend/html/dev/groups/admin/secret.html b/internal/suites/example/compose/nginx/backend/html/dev/groups/admin/secret.html similarity index 100% rename from example/compose/nginx/backend/html/dev/groups/admin/secret.html rename to internal/suites/example/compose/nginx/backend/html/dev/groups/admin/secret.html diff --git a/example/compose/nginx/backend/html/dev/groups/dev/secret.html b/internal/suites/example/compose/nginx/backend/html/dev/groups/dev/secret.html similarity index 100% rename from example/compose/nginx/backend/html/dev/groups/dev/secret.html rename to internal/suites/example/compose/nginx/backend/html/dev/groups/dev/secret.html diff --git a/example/compose/nginx/backend/html/dev/users/bob/secret.html b/internal/suites/example/compose/nginx/backend/html/dev/users/bob/secret.html similarity index 100% rename from example/compose/nginx/backend/html/dev/users/bob/secret.html rename to internal/suites/example/compose/nginx/backend/html/dev/users/bob/secret.html diff --git a/example/compose/nginx/backend/html/dev/users/harry/secret.html b/internal/suites/example/compose/nginx/backend/html/dev/users/harry/secret.html similarity index 100% rename from example/compose/nginx/backend/html/dev/users/harry/secret.html rename to internal/suites/example/compose/nginx/backend/html/dev/users/harry/secret.html diff --git a/example/compose/nginx/backend/html/dev/users/john/secret.html b/internal/suites/example/compose/nginx/backend/html/dev/users/john/secret.html similarity index 100% rename from example/compose/nginx/backend/html/dev/users/john/secret.html rename to internal/suites/example/compose/nginx/backend/html/dev/users/john/secret.html diff --git a/example/compose/nginx/backend/html/home/index.html b/internal/suites/example/compose/nginx/backend/html/home/index.html similarity index 100% rename from example/compose/nginx/backend/html/home/index.html rename to internal/suites/example/compose/nginx/backend/html/home/index.html diff --git a/example/compose/nginx/backend/html/icon.png b/internal/suites/example/compose/nginx/backend/html/icon.png similarity index 100% rename from example/compose/nginx/backend/html/icon.png rename to internal/suites/example/compose/nginx/backend/html/icon.png diff --git a/example/compose/nginx/backend/html/mail/secret.html b/internal/suites/example/compose/nginx/backend/html/mail/secret.html similarity index 100% rename from example/compose/nginx/backend/html/mail/secret.html rename to internal/suites/example/compose/nginx/backend/html/mail/secret.html diff --git a/example/compose/nginx/backend/html/public/index.html b/internal/suites/example/compose/nginx/backend/html/public/index.html similarity index 100% rename from example/compose/nginx/backend/html/public/index.html rename to internal/suites/example/compose/nginx/backend/html/public/index.html diff --git a/example/compose/nginx/backend/html/public/secret.html b/internal/suites/example/compose/nginx/backend/html/public/secret.html similarity index 100% rename from example/compose/nginx/backend/html/public/secret.html rename to internal/suites/example/compose/nginx/backend/html/public/secret.html diff --git a/example/compose/nginx/backend/html/secure/index.html b/internal/suites/example/compose/nginx/backend/html/secure/index.html similarity index 100% rename from example/compose/nginx/backend/html/secure/index.html rename to internal/suites/example/compose/nginx/backend/html/secure/index.html diff --git a/example/compose/nginx/backend/html/secure/secret.html b/internal/suites/example/compose/nginx/backend/html/secure/secret.html similarity index 100% rename from example/compose/nginx/backend/html/secure/secret.html rename to internal/suites/example/compose/nginx/backend/html/secure/secret.html diff --git a/example/compose/nginx/backend/html/singlefactor/secret.html b/internal/suites/example/compose/nginx/backend/html/singlefactor/secret.html similarity index 100% rename from example/compose/nginx/backend/html/singlefactor/secret.html rename to internal/suites/example/compose/nginx/backend/html/singlefactor/secret.html diff --git a/example/compose/nginx/backend/nginx.conf b/internal/suites/example/compose/nginx/backend/nginx.conf similarity index 100% rename from example/compose/nginx/backend/nginx.conf rename to internal/suites/example/compose/nginx/backend/nginx.conf diff --git a/example/compose/nginx/portal/docker-compose.yml b/internal/suites/example/compose/nginx/portal/docker-compose.yml similarity index 100% rename from example/compose/nginx/portal/docker-compose.yml rename to internal/suites/example/compose/nginx/portal/docker-compose.yml diff --git a/example/compose/nginx/portal/nginx.conf b/internal/suites/example/compose/nginx/portal/nginx.conf similarity index 100% rename from example/compose/nginx/portal/nginx.conf rename to internal/suites/example/compose/nginx/portal/nginx.conf diff --git a/example/compose/nginx/portal/ssl/server.cert b/internal/suites/example/compose/nginx/portal/ssl/server.cert similarity index 100% rename from example/compose/nginx/portal/ssl/server.cert rename to internal/suites/example/compose/nginx/portal/ssl/server.cert diff --git a/example/compose/nginx/portal/ssl/server.key b/internal/suites/example/compose/nginx/portal/ssl/server.key similarity index 100% rename from example/compose/nginx/portal/ssl/server.key rename to internal/suites/example/compose/nginx/portal/ssl/server.key diff --git a/example/compose/postgres/docker-compose.yml b/internal/suites/example/compose/postgres/docker-compose.yml similarity index 100% rename from example/compose/postgres/docker-compose.yml rename to internal/suites/example/compose/postgres/docker-compose.yml diff --git a/example/compose/redis/docker-compose.yml b/internal/suites/example/compose/redis/docker-compose.yml similarity index 100% rename from example/compose/redis/docker-compose.yml rename to internal/suites/example/compose/redis/docker-compose.yml diff --git a/example/compose/smtp/docker-compose.yml b/internal/suites/example/compose/smtp/docker-compose.yml similarity index 100% rename from example/compose/smtp/docker-compose.yml rename to internal/suites/example/compose/smtp/docker-compose.yml diff --git a/example/compose/squid/docker-compose.yml b/internal/suites/example/compose/squid/docker-compose.yml similarity index 100% rename from example/compose/squid/docker-compose.yml rename to internal/suites/example/compose/squid/docker-compose.yml diff --git a/example/compose/squid/squid.conf b/internal/suites/example/compose/squid/squid.conf similarity index 100% rename from example/compose/squid/squid.conf rename to internal/suites/example/compose/squid/squid.conf diff --git a/example/compose/traefik/docker-compose.yml b/internal/suites/example/compose/traefik/docker-compose.yml similarity index 100% rename from example/compose/traefik/docker-compose.yml rename to internal/suites/example/compose/traefik/docker-compose.yml diff --git a/example/compose/traefik2/docker-compose.yml b/internal/suites/example/compose/traefik2/docker-compose.yml similarity index 100% rename from example/compose/traefik2/docker-compose.yml rename to internal/suites/example/compose/traefik2/docker-compose.yml diff --git a/example/kube/README.md b/internal/suites/example/kube/README.md similarity index 99% rename from example/kube/README.md rename to internal/suites/example/kube/README.md index e0352e3a1..395fa1960 100644 --- a/example/kube/README.md +++ b/internal/suites/example/kube/README.md @@ -54,7 +54,7 @@ manual intervention. Given your cluster already runs a LDAP server, a Redis, a SQL database, a SMTP server and a nginx ingress-controller, you can deploy **Authelia** and update your ingress configurations. An example is provided -[here](./authelia). +[here](authelia). ## Questions diff --git a/example/kube/apps/apps.yml b/internal/suites/example/kube/apps/apps.yml similarity index 100% rename from example/kube/apps/apps.yml rename to internal/suites/example/kube/apps/apps.yml diff --git a/example/kube/apps/ssl/server.cert b/internal/suites/example/kube/apps/ssl/server.cert similarity index 100% rename from example/kube/apps/ssl/server.cert rename to internal/suites/example/kube/apps/ssl/server.cert diff --git a/example/kube/apps/ssl/server.key b/internal/suites/example/kube/apps/ssl/server.key similarity index 100% rename from example/kube/apps/ssl/server.key rename to internal/suites/example/kube/apps/ssl/server.key diff --git a/example/kube/authelia/configs/configuration.yml b/internal/suites/example/kube/authelia/configs/configuration.yml similarity index 100% rename from example/kube/authelia/configs/configuration.yml rename to internal/suites/example/kube/authelia/configs/configuration.yml diff --git a/example/kube/authelia/deployment.yml b/internal/suites/example/kube/authelia/deployment.yml similarity index 100% rename from example/kube/authelia/deployment.yml rename to internal/suites/example/kube/authelia/deployment.yml diff --git a/example/kube/authelia/ingress.yml b/internal/suites/example/kube/authelia/ingress.yml similarity index 100% rename from example/kube/authelia/ingress.yml rename to internal/suites/example/kube/authelia/ingress.yml diff --git a/example/kube/authelia/service.yml b/internal/suites/example/kube/authelia/service.yml similarity index 100% rename from example/kube/authelia/service.yml rename to internal/suites/example/kube/authelia/service.yml diff --git a/example/kube/bootstrap-authelia.sh b/internal/suites/example/kube/bootstrap-authelia.sh similarity index 100% rename from example/kube/bootstrap-authelia.sh rename to internal/suites/example/kube/bootstrap-authelia.sh diff --git a/example/kube/bootstrap-dashboard.sh b/internal/suites/example/kube/bootstrap-dashboard.sh similarity index 100% rename from example/kube/bootstrap-dashboard.sh rename to internal/suites/example/kube/bootstrap-dashboard.sh diff --git a/example/kube/bootstrap.sh b/internal/suites/example/kube/bootstrap.sh similarity index 100% rename from example/kube/bootstrap.sh rename to internal/suites/example/kube/bootstrap.sh diff --git a/example/kube/dashboard.yml b/internal/suites/example/kube/dashboard.yml similarity index 100% rename from example/kube/dashboard.yml rename to internal/suites/example/kube/dashboard.yml diff --git a/example/kube/ingress-controller/deployment.yml b/internal/suites/example/kube/ingress-controller/deployment.yml similarity index 100% rename from example/kube/ingress-controller/deployment.yml rename to internal/suites/example/kube/ingress-controller/deployment.yml diff --git a/example/kube/ingress-controller/rbac.yml b/internal/suites/example/kube/ingress-controller/rbac.yml similarity index 100% rename from example/kube/ingress-controller/rbac.yml rename to internal/suites/example/kube/ingress-controller/rbac.yml diff --git a/example/kube/ingress-controller/service.yml b/internal/suites/example/kube/ingress-controller/service.yml similarity index 100% rename from example/kube/ingress-controller/service.yml rename to internal/suites/example/kube/ingress-controller/service.yml diff --git a/example/kube/ldap/access.rules b/internal/suites/example/kube/ldap/access.rules similarity index 100% rename from example/kube/ldap/access.rules rename to internal/suites/example/kube/ldap/access.rules diff --git a/example/kube/ldap/base.ldif b/internal/suites/example/kube/ldap/base.ldif similarity index 100% rename from example/kube/ldap/base.ldif rename to internal/suites/example/kube/ldap/base.ldif diff --git a/example/kube/ldap/deployment.yml b/internal/suites/example/kube/ldap/deployment.yml similarity index 100% rename from example/kube/ldap/deployment.yml rename to internal/suites/example/kube/ldap/deployment.yml diff --git a/example/kube/ldap/service.yml b/internal/suites/example/kube/ldap/service.yml similarity index 100% rename from example/kube/ldap/service.yml rename to internal/suites/example/kube/ldap/service.yml diff --git a/example/kube/mail/deployment.yml b/internal/suites/example/kube/mail/deployment.yml similarity index 100% rename from example/kube/mail/deployment.yml rename to internal/suites/example/kube/mail/deployment.yml diff --git a/example/kube/mail/ingress.yml b/internal/suites/example/kube/mail/ingress.yml similarity index 100% rename from example/kube/mail/ingress.yml rename to internal/suites/example/kube/mail/ingress.yml diff --git a/example/kube/mail/service.yml b/internal/suites/example/kube/mail/service.yml similarity index 100% rename from example/kube/mail/service.yml rename to internal/suites/example/kube/mail/service.yml diff --git a/example/kube/namespace.yml b/internal/suites/example/kube/namespace.yml similarity index 100% rename from example/kube/namespace.yml rename to internal/suites/example/kube/namespace.yml diff --git a/example/kube/storage/mariadb.yml b/internal/suites/example/kube/storage/mariadb.yml similarity index 100% rename from example/kube/storage/mariadb.yml rename to internal/suites/example/kube/storage/mariadb.yml diff --git a/example/kube/storage/redis.yml b/internal/suites/example/kube/storage/redis.yml similarity index 100% rename from example/kube/storage/redis.yml rename to internal/suites/example/kube/storage/redis.yml diff --git a/example/kube/test.yml b/internal/suites/example/kube/test.yml similarity index 100% rename from example/kube/test.yml rename to internal/suites/example/kube/test.yml diff --git a/example/swarm/docker-compose.yml b/internal/suites/example/swarm/docker-compose.yml similarity index 100% rename from example/swarm/docker-compose.yml rename to internal/suites/example/swarm/docker-compose.yml diff --git a/internal/suites/kubernetes.go b/internal/suites/kubernetes.go index 9b351604f..a39248cde 100644 --- a/internal/suites/kubernetes.go +++ b/internal/suites/kubernetes.go @@ -10,7 +10,7 @@ import ( ) var kindImageName = "authelia-kind-proxy" -var dockerCmdLine = fmt.Sprintf("docker-compose -f docker-compose.yml -f example/compose/kind/docker-compose.yml run --rm %s", kindImageName) +var dockerCmdLine = fmt.Sprintf("docker-compose -p authelia -f internal/suites/docker-compose.yml -f internal/suites/example/compose/kind/docker-compose.yml run --rm %s", kindImageName) // Kind used for running kind commands type Kind struct{} @@ -73,13 +73,13 @@ type Kubectl struct{} // StartProxy start a proxy func (k Kubectl) StartProxy() error { - cmd := utils.Shell("docker-compose -f docker-compose.yml -f example/compose/kind/docker-compose.yml up -d authelia-kind-proxy") + cmd := utils.Shell("docker-compose -p authelia -f internal/suites/docker-compose.yml -f internal/suites/example/compose/kind/docker-compose.yml up -d authelia-kind-proxy") return cmd.Run() } // StopProxy stop a proxy func (k Kubectl) StopProxy() error { - cmd := utils.Shell("docker-compose -f docker-compose.yml -f example/compose/kind/docker-compose.yml rm -s -f authelia-kind-proxy") + cmd := utils.Shell("docker-compose -p authelia -f internal/suites/docker-compose.yml -f internal/suites/example/compose/kind/docker-compose.yml rm -s -f authelia-kind-proxy") return cmd.Run() } @@ -89,7 +89,7 @@ func (k Kubectl) StartDashboard() error { return err } - if err := utils.Shell("docker-compose -f docker-compose.yml -f example/compose/kind/docker-compose.yml up -d kube-dashboard").Run(); err != nil { + if err := utils.Shell("docker-compose -p authelia -f internal/suites/docker-compose.yml -f internal/suites/example/compose/kind/docker-compose.yml up -d kube-dashboard").Run(); err != nil { return err } return nil @@ -97,7 +97,7 @@ func (k Kubectl) StartDashboard() error { // StopDashboard stop kube dashboard func (k Kubectl) StopDashboard() error { - cmd := utils.Shell("docker-compose -f docker-compose.yml -f example/compose/kind/docker-compose.yml rm -s -f kube-dashboard") + cmd := utils.Shell("docker-compose -p authelia -f internal/suites/docker-compose.yml -f internal/suites/example/compose/kind/docker-compose.yml rm -s -f kube-dashboard") return cmd.Run() } diff --git a/internal/suites/suite_bypass_all.go b/internal/suites/suite_bypass_all.go index bd7592c89..6c365a4ea 100644 --- a/internal/suites/suite_bypass_all.go +++ b/internal/suites/suite_bypass_all.go @@ -9,15 +9,15 @@ var bypassAllSuiteName = "BypassAll" func init() { dockerEnvironment := NewDockerEnvironment([]string{ - "docker-compose.yml", + "internal/suites/docker-compose.yml", "internal/suites/BypassAll/docker-compose.yml", - "example/compose/authelia/docker-compose.backend.{}.yml", - "example/compose/authelia/docker-compose.frontend.{}.yml", - "example/compose/nginx/backend/docker-compose.yml", - "example/compose/nginx/portal/docker-compose.yml", - "example/compose/httpbin/docker-compose.yml", - "example/compose/smtp/docker-compose.yml", - "example/compose/duo-api/docker-compose.yml", + "internal/suites/example/compose/authelia/docker-compose.backend.{}.yml", + "internal/suites/example/compose/authelia/docker-compose.frontend.{}.yml", + "internal/suites/example/compose/nginx/backend/docker-compose.yml", + "internal/suites/example/compose/nginx/portal/docker-compose.yml", + "internal/suites/example/compose/httpbin/docker-compose.yml", + "internal/suites/example/compose/smtp/docker-compose.yml", + "internal/suites/example/compose/duo-api/docker-compose.yml", }) setup := func(suitePath string) error { diff --git a/internal/suites/suite_docker.go b/internal/suites/suite_docker.go index 334be2364..cd8034ffa 100644 --- a/internal/suites/suite_docker.go +++ b/internal/suites/suite_docker.go @@ -7,13 +7,13 @@ import ( func init() { dockerEnvironment := NewDockerEnvironment([]string{ - "docker-compose.yml", + "internal/suites/docker-compose.yml", "internal/suites/Docker/docker-compose.yml", - "example/compose/authelia/docker-compose.backend.dist.yml", - "example/compose/authelia/docker-compose.frontend.dist.yml", - "example/compose/nginx/backend/docker-compose.yml", - "example/compose/nginx/portal/docker-compose.yml", - "example/compose/smtp/docker-compose.yml", + "internal/suites/example/compose/authelia/docker-compose.backend.dist.yml", + "internal/suites/example/compose/authelia/docker-compose.frontend.dist.yml", + "internal/suites/example/compose/nginx/backend/docker-compose.yml", + "internal/suites/example/compose/nginx/portal/docker-compose.yml", + "internal/suites/example/compose/smtp/docker-compose.yml", }) setup := func(suitePath string) error { diff --git a/internal/suites/suite_duo_push.go b/internal/suites/suite_duo_push.go index e99fbc8a5..997f41d48 100644 --- a/internal/suites/suite_duo_push.go +++ b/internal/suites/suite_duo_push.go @@ -9,13 +9,13 @@ var duoPushSuiteName = "DuoPush" func init() { dockerEnvironment := NewDockerEnvironment([]string{ - "docker-compose.yml", + "internal/suites/docker-compose.yml", "internal/suites/DuoPush/docker-compose.yml", - "example/compose/authelia/docker-compose.backend.{}.yml", - "example/compose/authelia/docker-compose.frontend.{}.yml", - "example/compose/nginx/backend/docker-compose.yml", - "example/compose/nginx/portal/docker-compose.yml", - "example/compose/duo-api/docker-compose.yml", + "internal/suites/example/compose/authelia/docker-compose.backend.{}.yml", + "internal/suites/example/compose/authelia/docker-compose.frontend.{}.yml", + "internal/suites/example/compose/nginx/backend/docker-compose.yml", + "internal/suites/example/compose/nginx/portal/docker-compose.yml", + "internal/suites/example/compose/duo-api/docker-compose.yml", }) setup := func(suitePath string) error { diff --git a/internal/suites/suite_haproxy.go b/internal/suites/suite_haproxy.go index 7c7ba6c93..a71a3c59a 100644 --- a/internal/suites/suite_haproxy.go +++ b/internal/suites/suite_haproxy.go @@ -9,13 +9,13 @@ var haproxySuiteName = "HAProxy" func init() { dockerEnvironment := NewDockerEnvironment([]string{ - "docker-compose.yml", + "internal/suites/docker-compose.yml", "internal/suites/HAProxy/docker-compose.yml", - "example/compose/authelia/docker-compose.backend.{}.yml", - "example/compose/authelia/docker-compose.frontend.{}.yml", - "example/compose/nginx/backend/docker-compose.yml", - "example/compose/haproxy/docker-compose.yml", - "example/compose/smtp/docker-compose.yml", + "internal/suites/example/compose/authelia/docker-compose.backend.{}.yml", + "internal/suites/example/compose/authelia/docker-compose.frontend.{}.yml", + "internal/suites/example/compose/nginx/backend/docker-compose.yml", + "internal/suites/example/compose/haproxy/docker-compose.yml", + "internal/suites/example/compose/smtp/docker-compose.yml", }) setup := func(suitePath string) error { diff --git a/internal/suites/suite_high_availability.go b/internal/suites/suite_high_availability.go index 981e643f4..ec99b8206 100644 --- a/internal/suites/suite_high_availability.go +++ b/internal/suites/suite_high_availability.go @@ -8,18 +8,18 @@ import ( var highAvailabilitySuiteName = "HighAvailability" var haDockerEnvironment = NewDockerEnvironment([]string{ - "docker-compose.yml", + "internal/suites/docker-compose.yml", "internal/suites/HighAvailability/docker-compose.yml", - "example/compose/authelia/docker-compose.backend.{}.yml", - "example/compose/authelia/docker-compose.frontend.{}.yml", - "example/compose/mariadb/docker-compose.yml", - "example/compose/redis/docker-compose.yml", - "example/compose/nginx/backend/docker-compose.yml", - "example/compose/nginx/portal/docker-compose.yml", - "example/compose/smtp/docker-compose.yml", - "example/compose/httpbin/docker-compose.yml", - "example/compose/ldap/docker-compose.admin.yml", // This is just used for administration, not for testing. - "example/compose/ldap/docker-compose.yml", + "internal/suites/example/compose/authelia/docker-compose.backend.{}.yml", + "internal/suites/example/compose/authelia/docker-compose.frontend.{}.yml", + "internal/suites/example/compose/mariadb/docker-compose.yml", + "internal/suites/example/compose/redis/docker-compose.yml", + "internal/suites/example/compose/nginx/backend/docker-compose.yml", + "internal/suites/example/compose/nginx/portal/docker-compose.yml", + "internal/suites/example/compose/smtp/docker-compose.yml", + "internal/suites/example/compose/httpbin/docker-compose.yml", + "internal/suites/example/compose/ldap/docker-compose.admin.yml", // This is just used for administration, not for testing. + "internal/suites/example/compose/ldap/docker-compose.yml", }) func init() { diff --git a/internal/suites/suite_kubernetes.go b/internal/suites/suite_kubernetes.go index 3ffd4cba0..57129e99c 100644 --- a/internal/suites/suite_kubernetes.go +++ b/internal/suites/suite_kubernetes.go @@ -16,12 +16,12 @@ func init() { kubectl := Kubectl{} setup := func(suitePath string) error { - cmd := utils.Shell("docker-compose -f docker-compose.yml -f example/compose/kind/docker-compose.yml build") + cmd := utils.Shell("docker-compose -p authelia -f internal/suites/docker-compose.yml -f internal/suites/example/compose/kind/docker-compose.yml build") if err := cmd.Run(); err != nil { return err } - cmd = utils.Shell("docker build -t nginx-backend example/compose/nginx/backend") + cmd = utils.Shell("docker build -t nginx-backend internal/suites/example/compose/nginx/backend") if err := cmd.Run(); err != nil { return err } diff --git a/internal/suites/suite_ldap.go b/internal/suites/suite_ldap.go index cf114a46c..b92332772 100644 --- a/internal/suites/suite_ldap.go +++ b/internal/suites/suite_ldap.go @@ -9,15 +9,15 @@ var ldapSuiteName = "LDAP" func init() { dockerEnvironment := NewDockerEnvironment([]string{ - "docker-compose.yml", + "internal/suites/docker-compose.yml", "internal/suites/LDAP/docker-compose.yml", - "example/compose/authelia/docker-compose.backend.{}.yml", - "example/compose/authelia/docker-compose.frontend.{}.yml", - "example/compose/nginx/backend/docker-compose.yml", - "example/compose/nginx/portal/docker-compose.yml", - "example/compose/smtp/docker-compose.yml", - "example/compose/ldap/docker-compose.yml", - "example/compose/ldap/docker-compose.admin.yml", + "internal/suites/example/compose/authelia/docker-compose.backend.{}.yml", + "internal/suites/example/compose/authelia/docker-compose.frontend.{}.yml", + "internal/suites/example/compose/nginx/backend/docker-compose.yml", + "internal/suites/example/compose/nginx/portal/docker-compose.yml", + "internal/suites/example/compose/smtp/docker-compose.yml", + "internal/suites/example/compose/ldap/docker-compose.yml", + "internal/suites/example/compose/ldap/docker-compose.admin.yml", }) setup := func(suitePath string) error { diff --git a/internal/suites/suite_mariadb.go b/internal/suites/suite_mariadb.go index 6da030298..81928534c 100644 --- a/internal/suites/suite_mariadb.go +++ b/internal/suites/suite_mariadb.go @@ -9,15 +9,15 @@ var mariadbSuiteName = "Mariadb" func init() { dockerEnvironment := NewDockerEnvironment([]string{ - "docker-compose.yml", + "internal/suites/docker-compose.yml", "internal/suites/Mariadb/docker-compose.yml", - "example/compose/authelia/docker-compose.backend.{}.yml", - "example/compose/authelia/docker-compose.frontend.{}.yml", - "example/compose/nginx/backend/docker-compose.yml", - "example/compose/nginx/portal/docker-compose.yml", - "example/compose/smtp/docker-compose.yml", - "example/compose/mariadb/docker-compose.yml", - "example/compose/ldap/docker-compose.yml", + "internal/suites/example/compose/authelia/docker-compose.backend.{}.yml", + "internal/suites/example/compose/authelia/docker-compose.frontend.{}.yml", + "internal/suites/example/compose/nginx/backend/docker-compose.yml", + "internal/suites/example/compose/nginx/portal/docker-compose.yml", + "internal/suites/example/compose/smtp/docker-compose.yml", + "internal/suites/example/compose/mariadb/docker-compose.yml", + "internal/suites/example/compose/ldap/docker-compose.yml", }) setup := func(suitePath string) error { diff --git a/internal/suites/suite_network_acl.go b/internal/suites/suite_network_acl.go index bf809e484..4050b07a2 100644 --- a/internal/suites/suite_network_acl.go +++ b/internal/suites/suite_network_acl.go @@ -9,16 +9,16 @@ var networkACLSuiteName = "NetworkACL" func init() { dockerEnvironment := NewDockerEnvironment([]string{ - "docker-compose.yml", + "internal/suites/docker-compose.yml", "internal/suites/NetworkACL/docker-compose.yml", - "example/compose/authelia/docker-compose.backend.{}.yml", - "example/compose/authelia/docker-compose.frontend.{}.yml", - "example/compose/nginx/backend/docker-compose.yml", - "example/compose/nginx/portal/docker-compose.yml", - "example/compose/squid/docker-compose.yml", - "example/compose/smtp/docker-compose.yml", + "internal/suites/example/compose/authelia/docker-compose.backend.{}.yml", + "internal/suites/example/compose/authelia/docker-compose.frontend.{}.yml", + "internal/suites/example/compose/nginx/backend/docker-compose.yml", + "internal/suites/example/compose/nginx/portal/docker-compose.yml", + "internal/suites/example/compose/squid/docker-compose.yml", + "internal/suites/example/compose/smtp/docker-compose.yml", // To debug headers - "example/compose/httpbin/docker-compose.yml", + "internal/suites/example/compose/httpbin/docker-compose.yml", }) setup := func(suitePath string) error { diff --git a/internal/suites/suite_one_factor_default_policy.go b/internal/suites/suite_one_factor_default_policy.go index d0f7d522b..100cdc04f 100644 --- a/internal/suites/suite_one_factor_default_policy.go +++ b/internal/suites/suite_one_factor_default_policy.go @@ -9,12 +9,12 @@ var oneFactorDefaultPolicySuiteName = "OneFactorDefaultPolicy" func init() { dockerEnvironment := NewDockerEnvironment([]string{ - "docker-compose.yml", + "internal/suites/docker-compose.yml", "internal/suites/OneFactorDefaultPolicy/docker-compose.yml", - "example/compose/authelia/docker-compose.backend.{}.yml", - "example/compose/authelia/docker-compose.frontend.{}.yml", - "example/compose/nginx/backend/docker-compose.yml", - "example/compose/nginx/portal/docker-compose.yml", + "internal/suites/example/compose/authelia/docker-compose.backend.{}.yml", + "internal/suites/example/compose/authelia/docker-compose.frontend.{}.yml", + "internal/suites/example/compose/nginx/backend/docker-compose.yml", + "internal/suites/example/compose/nginx/portal/docker-compose.yml", }) setup := func(suitePath string) error { diff --git a/internal/suites/suite_postgres.go b/internal/suites/suite_postgres.go index 454defaaf..024f1ac71 100644 --- a/internal/suites/suite_postgres.go +++ b/internal/suites/suite_postgres.go @@ -9,15 +9,15 @@ var postgresSuiteName = "Postgres" func init() { dockerEnvironment := NewDockerEnvironment([]string{ - "docker-compose.yml", + "internal/suites/docker-compose.yml", "internal/suites/Postgres/docker-compose.yml", - "example/compose/authelia/docker-compose.backend.{}.yml", - "example/compose/authelia/docker-compose.frontend.{}.yml", - "example/compose/nginx/backend/docker-compose.yml", - "example/compose/nginx/portal/docker-compose.yml", - "example/compose/smtp/docker-compose.yml", - "example/compose/postgres/docker-compose.yml", - "example/compose/ldap/docker-compose.yml", + "internal/suites/example/compose/authelia/docker-compose.backend.{}.yml", + "internal/suites/example/compose/authelia/docker-compose.frontend.{}.yml", + "internal/suites/example/compose/nginx/backend/docker-compose.yml", + "internal/suites/example/compose/nginx/portal/docker-compose.yml", + "internal/suites/example/compose/smtp/docker-compose.yml", + "internal/suites/example/compose/postgres/docker-compose.yml", + "internal/suites/example/compose/ldap/docker-compose.yml", }) setup := func(suitePath string) error { diff --git a/internal/suites/suite_short_timeouts.go b/internal/suites/suite_short_timeouts.go index d06f12677..228692535 100644 --- a/internal/suites/suite_short_timeouts.go +++ b/internal/suites/suite_short_timeouts.go @@ -9,13 +9,13 @@ var shortTimeoutsSuiteName = "ShortTimeouts" func init() { dockerEnvironment := NewDockerEnvironment([]string{ - "docker-compose.yml", + "internal/suites/docker-compose.yml", "internal/suites/ShortTimeouts/docker-compose.yml", - "example/compose/authelia/docker-compose.backend.{}.yml", - "example/compose/authelia/docker-compose.frontend.{}.yml", - "example/compose/nginx/backend/docker-compose.yml", - "example/compose/nginx/portal/docker-compose.yml", - "example/compose/smtp/docker-compose.yml", + "internal/suites/example/compose/authelia/docker-compose.backend.{}.yml", + "internal/suites/example/compose/authelia/docker-compose.frontend.{}.yml", + "internal/suites/example/compose/nginx/backend/docker-compose.yml", + "internal/suites/example/compose/nginx/portal/docker-compose.yml", + "internal/suites/example/compose/smtp/docker-compose.yml", }) setup := func(suitePath string) error { diff --git a/internal/suites/suite_standalone.go b/internal/suites/suite_standalone.go index 109f21e98..877b2fef7 100644 --- a/internal/suites/suite_standalone.go +++ b/internal/suites/suite_standalone.go @@ -9,13 +9,13 @@ var standaloneSuiteName = "Standalone" func init() { dockerEnvironment := NewDockerEnvironment([]string{ - "docker-compose.yml", + "internal/suites/docker-compose.yml", "internal/suites/Standalone/docker-compose.yml", - "example/compose/authelia/docker-compose.backend.{}.yml", - "example/compose/authelia/docker-compose.frontend.{}.yml", - "example/compose/nginx/backend/docker-compose.yml", - "example/compose/nginx/portal/docker-compose.yml", - "example/compose/smtp/docker-compose.yml", + "internal/suites/example/compose/authelia/docker-compose.backend.{}.yml", + "internal/suites/example/compose/authelia/docker-compose.frontend.{}.yml", + "internal/suites/example/compose/nginx/backend/docker-compose.yml", + "internal/suites/example/compose/nginx/portal/docker-compose.yml", + "internal/suites/example/compose/smtp/docker-compose.yml", }) setup := func(suitePath string) error { diff --git a/internal/suites/suite_traefik.go b/internal/suites/suite_traefik.go index c5017e9f5..fbe4e9a86 100644 --- a/internal/suites/suite_traefik.go +++ b/internal/suites/suite_traefik.go @@ -9,13 +9,13 @@ var traefikSuiteName = "Traefik" func init() { dockerEnvironment := NewDockerEnvironment([]string{ - "docker-compose.yml", + "internal/suites/docker-compose.yml", "internal/suites/Traefik/docker-compose.yml", - "example/compose/authelia/docker-compose.backend.{}.yml", - "example/compose/authelia/docker-compose.frontend.{}.yml", - "example/compose/nginx/backend/docker-compose.yml", - "example/compose/traefik/docker-compose.yml", - "example/compose/smtp/docker-compose.yml", + "internal/suites/example/compose/authelia/docker-compose.backend.{}.yml", + "internal/suites/example/compose/authelia/docker-compose.frontend.{}.yml", + "internal/suites/example/compose/nginx/backend/docker-compose.yml", + "internal/suites/example/compose/traefik/docker-compose.yml", + "internal/suites/example/compose/smtp/docker-compose.yml", }) setup := func(suitePath string) error { diff --git a/internal/suites/suite_traefik2.go b/internal/suites/suite_traefik2.go index 8fe29cd93..bbc489640 100644 --- a/internal/suites/suite_traefik2.go +++ b/internal/suites/suite_traefik2.go @@ -9,13 +9,13 @@ var traefik2SuiteName = "Traefik2" func init() { dockerEnvironment := NewDockerEnvironment([]string{ - "docker-compose.yml", + "internal/suites/docker-compose.yml", "internal/suites/Traefik2/docker-compose.yml", - "example/compose/authelia/docker-compose.backend.{}.yml", - "example/compose/authelia/docker-compose.frontend.{}.yml", - "example/compose/nginx/backend/docker-compose.yml", - "example/compose/traefik2/docker-compose.yml", - "example/compose/smtp/docker-compose.yml", + "internal/suites/example/compose/authelia/docker-compose.backend.{}.yml", + "internal/suites/example/compose/authelia/docker-compose.frontend.{}.yml", + "internal/suites/example/compose/nginx/backend/docker-compose.yml", + "internal/suites/example/compose/traefik2/docker-compose.yml", + "internal/suites/example/compose/smtp/docker-compose.yml", }) setup := func(suitePath string) error {