diff --git a/example/authelia/docker-compose.dev.yml b/example/compose/authelia/docker-compose.dev.yml similarity index 100% rename from example/authelia/docker-compose.dev.yml rename to example/compose/authelia/docker-compose.dev.yml diff --git a/example/authelia/docker-compose.test.yml b/example/compose/authelia/docker-compose.test.yml similarity index 100% rename from example/authelia/docker-compose.test.yml rename to example/compose/authelia/docker-compose.test.yml diff --git a/example/docker-compose.base.yml b/example/compose/docker-compose.base.yml similarity index 100% rename from example/docker-compose.base.yml rename to example/compose/docker-compose.base.yml diff --git a/example/httpbin/docker-compose.yml b/example/compose/httpbin/docker-compose.yml similarity index 100% rename from example/httpbin/docker-compose.yml rename to example/compose/httpbin/docker-compose.yml diff --git a/example/ldap/access.rules b/example/compose/ldap/access.rules similarity index 100% rename from example/ldap/access.rules rename to example/compose/ldap/access.rules diff --git a/example/ldap/base.ldif b/example/compose/ldap/base.ldif similarity index 100% rename from example/ldap/base.ldif rename to example/compose/ldap/base.ldif diff --git a/example/ldap/docker-compose.admin.yml b/example/compose/ldap/docker-compose.admin.yml similarity index 100% rename from example/ldap/docker-compose.admin.yml rename to example/compose/ldap/docker-compose.admin.yml diff --git a/example/ldap/docker-compose.yml b/example/compose/ldap/docker-compose.yml similarity index 71% rename from example/ldap/docker-compose.yml rename to example/compose/ldap/docker-compose.yml index e991df60..41de32b2 100644 --- a/example/ldap/docker-compose.yml +++ b/example/compose/ldap/docker-compose.yml @@ -11,8 +11,8 @@ services: - SLAPD_ADDITIONAL_SCHEMAS=openldap - SLAPD_FORCE_RECONFIGURE=true volumes: - - ./example/ldap/base.ldif:/etc/ldap.dist/prepopulate/base.ldif - - ./example/ldap/access.rules:/etc/ldap.dist/prepopulate/access.rules + - ./example/compose/ldap/base.ldif:/etc/ldap.dist/prepopulate/base.ldif + - ./example/compose/ldap/access.rules:/etc/ldap.dist/prepopulate/access.rules networks: - example-network diff --git a/example/mongo/docker-compose.yml b/example/compose/mongo/docker-compose.yml similarity index 100% rename from example/mongo/docker-compose.yml rename to example/compose/mongo/docker-compose.yml diff --git a/example/nginx/authelia/docker-compose.yml b/example/compose/nginx/authelia/docker-compose.yml similarity index 61% rename from example/nginx/authelia/docker-compose.yml rename to example/compose/nginx/authelia/docker-compose.yml index cd590620..66994ce2 100644 --- a/example/nginx/authelia/docker-compose.yml +++ b/example/compose/nginx/authelia/docker-compose.yml @@ -3,6 +3,6 @@ services: nginx-authelia: image: nginx:alpine volumes: - - ./example/nginx/authelia/nginx.conf:/etc/nginx/nginx.conf + - ./example/compose/nginx/authelia/nginx.conf:/etc/nginx/nginx.conf networks: - example-network diff --git a/example/nginx/authelia/nginx.conf b/example/compose/nginx/authelia/nginx.conf similarity index 100% rename from example/nginx/authelia/nginx.conf rename to example/compose/nginx/authelia/nginx.conf diff --git a/example/compose/nginx/backend/docker-compose.yml b/example/compose/nginx/backend/docker-compose.yml new file mode 100644 index 00000000..6b5856dc --- /dev/null +++ b/example/compose/nginx/backend/docker-compose.yml @@ -0,0 +1,9 @@ +version: '2' +services: + nginx-backend: + image: nginx:alpine + volumes: + - ./example/compose/nginx/backend/html:/usr/share/nginx/html + - ./example/compose/nginx/backend/nginx.conf:/etc/nginx/nginx.conf + networks: + - example-network diff --git a/example/nginx/backend/html/admin/secret.html b/example/compose/nginx/backend/html/admin/secret.html similarity index 100% rename from example/nginx/backend/html/admin/secret.html rename to example/compose/nginx/backend/html/admin/secret.html diff --git a/example/nginx/backend/html/dev/groups/admin/secret.html b/example/compose/nginx/backend/html/dev/groups/admin/secret.html similarity index 100% rename from example/nginx/backend/html/dev/groups/admin/secret.html rename to example/compose/nginx/backend/html/dev/groups/admin/secret.html diff --git a/example/nginx/backend/html/dev/groups/dev/secret.html b/example/compose/nginx/backend/html/dev/groups/dev/secret.html similarity index 100% rename from example/nginx/backend/html/dev/groups/dev/secret.html rename to example/compose/nginx/backend/html/dev/groups/dev/secret.html diff --git a/example/nginx/backend/html/dev/users/bob/secret.html b/example/compose/nginx/backend/html/dev/users/bob/secret.html similarity index 100% rename from example/nginx/backend/html/dev/users/bob/secret.html rename to example/compose/nginx/backend/html/dev/users/bob/secret.html diff --git a/example/nginx/backend/html/dev/users/harry/secret.html b/example/compose/nginx/backend/html/dev/users/harry/secret.html similarity index 100% rename from example/nginx/backend/html/dev/users/harry/secret.html rename to example/compose/nginx/backend/html/dev/users/harry/secret.html diff --git a/example/nginx/backend/html/dev/users/john/secret.html b/example/compose/nginx/backend/html/dev/users/john/secret.html similarity index 100% rename from example/nginx/backend/html/dev/users/john/secret.html rename to example/compose/nginx/backend/html/dev/users/john/secret.html diff --git a/example/nginx/backend/html/home/index.html b/example/compose/nginx/backend/html/home/index.html similarity index 100% rename from example/nginx/backend/html/home/index.html rename to example/compose/nginx/backend/html/home/index.html diff --git a/example/nginx/backend/html/icon.png b/example/compose/nginx/backend/html/icon.png similarity index 100% rename from example/nginx/backend/html/icon.png rename to example/compose/nginx/backend/html/icon.png diff --git a/example/nginx/backend/html/mail/secret.html b/example/compose/nginx/backend/html/mail/secret.html similarity index 100% rename from example/nginx/backend/html/mail/secret.html rename to example/compose/nginx/backend/html/mail/secret.html diff --git a/example/nginx/backend/html/public/index.html b/example/compose/nginx/backend/html/public/index.html similarity index 100% rename from example/nginx/backend/html/public/index.html rename to example/compose/nginx/backend/html/public/index.html diff --git a/example/nginx/backend/html/public/secret.html b/example/compose/nginx/backend/html/public/secret.html similarity index 100% rename from example/nginx/backend/html/public/secret.html rename to example/compose/nginx/backend/html/public/secret.html diff --git a/example/nginx/backend/html/single_factor/secret.html b/example/compose/nginx/backend/html/single_factor/secret.html similarity index 100% rename from example/nginx/backend/html/single_factor/secret.html rename to example/compose/nginx/backend/html/single_factor/secret.html diff --git a/example/nginx/backend/nginx.conf b/example/compose/nginx/backend/nginx.conf similarity index 100% rename from example/nginx/backend/nginx.conf rename to example/compose/nginx/backend/nginx.conf diff --git a/example/nginx/portal/docker-compose.yml b/example/compose/nginx/portal/docker-compose.yml similarity index 53% rename from example/nginx/portal/docker-compose.yml rename to example/compose/nginx/portal/docker-compose.yml index af52f092..d6d4bb64 100644 --- a/example/nginx/portal/docker-compose.yml +++ b/example/compose/nginx/portal/docker-compose.yml @@ -3,8 +3,8 @@ services: nginx-portal: image: nginx:alpine volumes: - - ./example/nginx/portal/nginx.conf:/etc/nginx/nginx.conf - - ./example/nginx/portal/ssl:/etc/ssl + - ./example/compose/nginx/portal/nginx.conf:/etc/nginx/nginx.conf + - ./example/compose/nginx/portal/ssl:/etc/ssl ports: - "8080:443" networks: diff --git a/example/nginx/portal/nginx.conf b/example/compose/nginx/portal/nginx.conf similarity index 100% rename from example/nginx/portal/nginx.conf rename to example/compose/nginx/portal/nginx.conf diff --git a/example/nginx/portal/ssl/server.crt b/example/compose/nginx/portal/ssl/server.crt similarity index 100% rename from example/nginx/portal/ssl/server.crt rename to example/compose/nginx/portal/ssl/server.crt diff --git a/example/nginx/portal/ssl/server.csr b/example/compose/nginx/portal/ssl/server.csr similarity index 100% rename from example/nginx/portal/ssl/server.csr rename to example/compose/nginx/portal/ssl/server.csr diff --git a/example/nginx/portal/ssl/server.key b/example/compose/nginx/portal/ssl/server.key similarity index 100% rename from example/nginx/portal/ssl/server.key rename to example/compose/nginx/portal/ssl/server.key diff --git a/example/redis/docker-compose.yml b/example/compose/redis/docker-compose.yml similarity index 100% rename from example/redis/docker-compose.yml rename to example/compose/redis/docker-compose.yml diff --git a/example/smtp/docker-compose.yml b/example/compose/smtp/docker-compose.yml similarity index 100% rename from example/smtp/docker-compose.yml rename to example/compose/smtp/docker-compose.yml diff --git a/example/nginx/backend/docker-compose.yml b/example/nginx/backend/docker-compose.yml deleted file mode 100644 index 9adb9f28..00000000 --- a/example/nginx/backend/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: '2' -services: - nginx-backend: - image: nginx:alpine - volumes: - - ./example/nginx/backend/html:/usr/share/nginx/html - - ./example/nginx/backend/nginx.conf:/etc/nginx/nginx.conf - networks: - - example-network diff --git a/scripts/dc-dev.sh b/scripts/dc-dev.sh index 2a04d59e..cff64d51 100755 --- a/scripts/dc-dev.sh +++ b/scripts/dc-dev.sh @@ -4,14 +4,14 @@ set -e docker-compose \ -f docker-compose.yml \ - -f example/docker-compose.base.yml \ - -f example/authelia/docker-compose.dev.yml \ - -f example/mongo/docker-compose.yml \ - -f example/redis/docker-compose.yml \ - -f example/nginx/authelia/docker-compose.yml \ - -f example/nginx/backend/docker-compose.yml \ - -f example/nginx/portal/docker-compose.yml \ - -f example/smtp/docker-compose.yml \ - -f example/httpbin/docker-compose.yml \ - -f example/ldap/docker-compose.admin.yml \ - -f example/ldap/docker-compose.yml $* + -f example/compose/docker-compose.base.yml \ + -f example/compose/authelia/docker-compose.dev.yml \ + -f example/compose/mongo/docker-compose.yml \ + -f example/compose/redis/docker-compose.yml \ + -f example/compose/nginx/authelia/docker-compose.yml \ + -f example/compose/nginx/backend/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 $* diff --git a/scripts/example-commit/dc-example.sh b/scripts/example-commit/dc-example.sh index 020bfde7..8e36b415 100755 --- a/scripts/example-commit/dc-example.sh +++ b/scripts/example-commit/dc-example.sh @@ -4,12 +4,12 @@ set -e docker-compose \ -f docker-compose.yml \ - -f example/docker-compose.base.yml \ - -f example/mongo/docker-compose.yml \ - -f example/redis/docker-compose.yml \ - -f example/nginx/authelia/docker-compose.yml \ - -f example/nginx/backend/docker-compose.yml \ - -f example/nginx/portal/docker-compose.yml \ - -f example/smtp/docker-compose.yml \ - -f example/httpbin/docker-compose.yml \ - -f example/ldap/docker-compose.yml $* + -f example/compose/docker-compose.base.yml \ + -f example/compose/mongo/docker-compose.yml \ + -f example/compose/redis/docker-compose.yml \ + -f example/compose/nginx/authelia/docker-compose.yml \ + -f example/compose/nginx/backend/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.yml $* diff --git a/scripts/example-dockerhub/dc-example.sh b/scripts/example-dockerhub/dc-example.sh index 9ce3e2ea..803b3d59 100755 --- a/scripts/example-dockerhub/dc-example.sh +++ b/scripts/example-dockerhub/dc-example.sh @@ -4,12 +4,12 @@ set -e docker-compose \ -f docker-compose.dockerhub.yml \ - -f example/docker-compose.base.yml \ - -f example/mongo/docker-compose.yml \ - -f example/redis/docker-compose.yml \ - -f example/nginx/authelia/docker-compose.yml \ - -f example/nginx/backend/docker-compose.yml \ - -f example/nginx/portal/docker-compose.yml \ - -f example/smtp/docker-compose.yml \ - -f example/httpbin/docker-compose.yml \ - -f example/ldap/docker-compose.yml $* + -f example/compose/docker-compose.base.yml \ + -f example/compose/mongo/docker-compose.yml \ + -f example/compose/redis/docker-compose.yml \ + -f example/compose/nginx/authelia/docker-compose.yml \ + -f example/compose/nginx/backend/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.yml $*