From b8c8c3bd7589abb4442a7c6c3cd3ea2303bc28f1 Mon Sep 17 00:00:00 2001 From: Clement Michaud Date: Thu, 2 Nov 2017 00:19:23 +0100 Subject: [PATCH] Move docker-compose files to the example directory --- .../authelia/docker-compose.dev.yml | 2 -- .../{docker-compose.yml => docker-compose.dockerhub.yml} | 0 .../authelia/docker-compose.test.yml | 0 docker-compose.base.yml => example/docker-compose.base.yml | 0 scripts/dc-dev.sh | 4 ++-- scripts/example-commit/dc-example.sh | 2 +- scripts/example-dockerhub/dc-example.sh | 4 ++-- 7 files changed, 5 insertions(+), 7 deletions(-) rename docker-compose.dev.yml => example/authelia/docker-compose.dev.yml (65%) rename example/authelia/{docker-compose.yml => docker-compose.dockerhub.yml} (100%) rename docker-compose.test.yml => example/authelia/docker-compose.test.yml (100%) rename docker-compose.base.yml => example/docker-compose.base.yml (100%) diff --git a/docker-compose.dev.yml b/example/authelia/docker-compose.dev.yml similarity index 65% rename from docker-compose.dev.yml rename to example/authelia/docker-compose.dev.yml index 1290afd1e..015546290 100644 --- a/docker-compose.dev.yml +++ b/example/authelia/docker-compose.dev.yml @@ -2,9 +2,7 @@ version: '2' services: authelia: volumes: - - ./test:/usr/src/test - ./dist/server:/usr/src/server - ./dist/shared:/usr/src/shared - - ./config.template.yml:/etc/authelia/config.yml:ro networks: - example-network diff --git a/example/authelia/docker-compose.yml b/example/authelia/docker-compose.dockerhub.yml similarity index 100% rename from example/authelia/docker-compose.yml rename to example/authelia/docker-compose.dockerhub.yml diff --git a/docker-compose.test.yml b/example/authelia/docker-compose.test.yml similarity index 100% rename from docker-compose.test.yml rename to example/authelia/docker-compose.test.yml diff --git a/docker-compose.base.yml b/example/docker-compose.base.yml similarity index 100% rename from docker-compose.base.yml rename to example/docker-compose.base.yml diff --git a/scripts/dc-dev.sh b/scripts/dc-dev.sh index 75b6ba6a2..cbee1a135 100755 --- a/scripts/dc-dev.sh +++ b/scripts/dc-dev.sh @@ -3,9 +3,9 @@ set -e docker-compose \ - -f docker-compose.base.yml \ -f docker-compose.yml \ - -f docker-compose.dev.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/docker-compose.yml \ diff --git a/scripts/example-commit/dc-example.sh b/scripts/example-commit/dc-example.sh index 59c344c44..7d38612e6 100755 --- a/scripts/example-commit/dc-example.sh +++ b/scripts/example-commit/dc-example.sh @@ -3,8 +3,8 @@ set -e docker-compose \ - -f docker-compose.base.yml \ -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/docker-compose.yml \ diff --git a/scripts/example-dockerhub/dc-example.sh b/scripts/example-dockerhub/dc-example.sh index 94d242ba1..df09c07ed 100755 --- a/scripts/example-dockerhub/dc-example.sh +++ b/scripts/example-dockerhub/dc-example.sh @@ -3,8 +3,8 @@ set -e docker-compose \ - -f docker-compose.base.yml \ - -f example/authelia/docker-compose.yml \ + -f example/docker-compose.base.yml \ + -f example/authelia/docker-compose.dockerhub.yml \ -f example/mongo/docker-compose.yml \ -f example/redis/docker-compose.yml \ -f example/nginx/docker-compose.yml \