From 221ce8d2e414c95d6277baf4d1e6ebc644ee0b7c Mon Sep 17 00:00:00 2001
From: Markus Krogh <markus@nordu.net>
Date: Wed, 27 Sep 2017 15:52:06 +0200
Subject: Remove conf-from-container, update git ignore

---
 README.md | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index fab1c2b..89aea33 100755
--- a/README.md
+++ b/README.md
@@ -35,41 +35,30 @@ the 2.x version.
 
 # Testing
 
-run.sh
+The NORDUnet configuration requires that you can reach `ldap.nordu.net`, so make sure you can reach that. E.g. I need to be on VPN to access it.
 
-```
-#docker build -t $(basename $(pwd)) . && docker run -p80:80 -p 443:443 --rm -ti $(basename $(pwd))
-# shibboleth-docker
-docker build -t $(basename $(pwd)) . && docker run --rm -ti --name shibboleth-docker $(basename $(pwd))
-```
+Add the following to your `/etc/hosts` file:
 
 ```
-# Apache SP
-docker build -t $(basename $(pwd)) . && docker run --rm -ti -p80:80 -p 443:443 -e SP_HOSTNAME=sp.nordu.dev --link shibboleth-docker $(basename $(pwd))
+127.0.0.1 idp.nordu.dev sp.nordu.dev
 ```
 
-```
-hlk@bujin:hlk$ cat /etc/hosts
-##
-# Host Database
-#
-# localhost is used to configure the loopback interface
-# when the system is booting.  Do not change this entry.
-##
-127.0.0.1	localhost
-255.255.255.255	broadcasthost
-::1             localhost
+Then you can use docker compose to build and start the containers. 
 
-127.0.0.1 idp.nordu.dev sp.nordu.dev
+```
+docker-compose -f compose-dev.yml up --build
 ```
 
-Then you should be able to go to: https://sp.nordu.dev/secure/
+When everything has started you need to add the SP metadata to the IdP, this can be done by running:
 
-Getting metadata out from the Apache SP
 ```
- curl -k https://sp.nordu.dev/Shibboleth.sso/Metadata > sp-metadata.xml
+curl -k https://sp.nordu.dev/Shibboleth.sso/Metadata -o data/idp/metadata/sp-metadata.xml
+dokcer-compose -f compose-dev.yml restart shibboleth-docker
 ```
 
+Now you should be able to navigate to `https://sp.nordu.dev/secure/` where you should be prompted to log in.
+
+
 # Resources
 Links from Jesper Rosenkilde
 
-- 
cgit v1.1