From bdde3ce824451d1917a99e91e35ce3c21235510a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89loi=20Rivard?= <eloi.rivard@aquilenet.fr>
Date: Fri, 6 Nov 2020 18:38:14 +0100
Subject: [PATCH] Moved development environment in a dedicated directory

---
 CONTRIBUTING.rst               |  1 +
 {docker => dev}/Dockerfile     |  0
 dev/README.md                  |  5 +++++
 {docker => dev}/bootstrap.ldif |  0
 dev/docker-compose.yml         | 24 ++++++++++++++++++++++++
 docker-compose.yml             | 24 ------------------------
 6 files changed, 30 insertions(+), 24 deletions(-)
 rename {docker => dev}/Dockerfile (100%)
 create mode 100644 dev/README.md
 rename {docker => dev}/bootstrap.ldif (100%)
 create mode 100644 dev/docker-compose.yml
 delete mode 100644 docker-compose.yml

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 34b18c08..6b4c4cc3 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -24,4 +24,5 @@ You can then connect with user *admin* and password *admin* to access an admin a
     cp canaille/conf/config.sample.toml canaille/conf/config.toml
     cp canaille/conf/oauth-authorization-server.sample.json canaille/conf/oauth-authorization-server.json
     cp canaille/conf/openid-configuration.sample.json canaille/conf/openid-configuration.json
+    cd dev
     docker-compose up
diff --git a/docker/Dockerfile b/dev/Dockerfile
similarity index 100%
rename from docker/Dockerfile
rename to dev/Dockerfile
diff --git a/dev/README.md b/dev/README.md
new file mode 100644
index 00000000..36e563dd
--- /dev/null
+++ b/dev/README.md
@@ -0,0 +1,5 @@
+# Devevolpment
+
+Here are tools for developping.
+
+Run `docker-compose up`.
diff --git a/docker/bootstrap.ldif b/dev/bootstrap.ldif
similarity index 100%
rename from docker/bootstrap.ldif
rename to dev/bootstrap.ldif
diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
new file mode 100644
index 00000000..aaef2790
--- /dev/null
+++ b/dev/docker-compose.yml
@@ -0,0 +1,24 @@
+---
+version: "3"
+
+services:
+  ldap:
+    image: osixia/openldap
+    environment:
+      - LDAP_DOMAIN=mydomain.tld
+    volumes:
+      - ./bootstrap.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/50-boostrap.ldif:ro
+      - ../schemas/oauth2-openldap.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/40-oauth2.ldif:ro
+    command: --copy-service --loglevel debug
+    ports:
+      - 5389:389
+      - 5636:636
+
+  oauth:
+    build:
+      context: ..
+      dockerfile: dev/Dockerfile
+    ports:
+      - 5000:5000
+    volumes:
+      - ../:/app
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 511a5853..00000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-version: "3"
-
-services:
-  ldap:
-    image: osixia/openldap
-    environment:
-      - LDAP_DOMAIN=mydomain.tld
-    volumes:
-      - ./docker/bootstrap.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/50-boostrap.ldif:ro
-      - ./schemas/oauth2-openldap.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/40-oauth2.ldif:ro
-    command: --copy-service --loglevel debug
-    ports:
-      - 5389:389
-      - 5636:636
-
-  oauth:
-    build:
-      context: .
-      dockerfile: docker/Dockerfile
-    ports:
-      - 5000:5000
-    volumes:
-      - .:/app