* Move rebuild functionality to dev-start.sh to avoid duplication

* Use "docker compose cp" to get the SSP sources from the container to the host in stead of using rsync

Author: pmeulen

.gitignore

@@ -1,2 +1,2 @@
-/container-files/simplesaml/
 .idea/
+/container/

README.md

@@ -33,11 +33,20 @@ When developing the OpenConect-devssp itself you can run devssp using the docker
 
 Then go to [https://ssp.dev.openconext.local/](https://ssp.dev.openconext.local/).
 The proxy uses a self-signed certificate, so you will need to accept this certificate in your browser.
-  
-- `./dev-rebuild.sh` will rebuild the container and pull the latest base image
-
-Both the `./dev-start.sh` and `./dev-rebuild.sh` scripts will copy the simplesaml directory from the container to `./container-files` on your host. This way you can use xdebug with the actual source files from the container by setting op a local path mapping in your IDE.
 
-Then go to [https://ssp.dev.openconext.local/](https://ssp.dev.openconext.local/). The proxy uses a self-signed certificate, so you will need to accept this certificate in your browser.
+## dev-start.sh
+  
+You can use the `./dev-start.sh` script to start the containers in the background.
+Ths script will copy the contents of the `/var/www` directory in the container to the `container/var/www` directory on 
+the host each time the container is started so that source debugging of these files is possible
+from the IDE.
+
+With the `-r` option you can force a rebuild of the containers.
+```bash
+  ./dev-start.sh -r
+```
+
+## Debugging
+The container has XDebug installed and configured.
 
 

container-files/scripts/sync.sh

@@ -11,21 +11,56 @@ if [ ! -d "$DIR/../OpenConext-devconf/stepup/ssp" ]; then
     exit 1
 fi
 
-# This script will start the Docker containers, rebuild the images
-# The  --force-recreate  flag will recreate the containers even if they are already running.
-# The  --build  flag will rebuild the devssp image
+# check commandline parameters:
+# -h or --help: show help
+# -r or --rebuild: force rebuild of the image and containers
+FORCE_REBUILD=0
+if [[ "$1" == "-h" || "$1" == "--help" ]]; then
+    echo "Usage: $0 [-r|--rebuild]"
+    echo "  -r, --rebuild   Force rebuild of the image and containers"
+    exit 0
+elif [[ "$1" == "-r" || "$1" == "--rebuild" ]]; then
+    FORCE_REBUILD=1
+fi
 
-echo "Rebuilding the devssp image and starting the containers..."
-docker compose up --force-recreate --build -d --wait
-echo "Containers are up"
+# Show hint if no parameters are given
+if [[ "$#" -eq 0 ]]; then
+    echo "Staring the container. Use -h or --help for more options"
+    echo ""
+fi
+
+if [[ "$FORCE_REBUILD" -eq 1 ]]; then
+    echo "Rebuilding the image and containers..."
+    # This script will rebuild / pull Docker the docker images
+    # then recreate and start the Docker containers
+    echo "compose build --no-cache --pull"
+    docker compose build --no-cache --pull
 
-# execute the sync script in the container
-echo "Syncing the SSP installation directory to the host"
-docker compose exec -it ssp /scripts/sync.sh
-echo "Syncing done"
+    # This script will start the Docker containers, rebuild the images
+    # The  --force-recreate  flag will recreate the containers even if they are already running.
+    # The  --build  flag will rebuild the devssp image
+    echo "Rebuilding the devssp image and starting the containers..."
+    docker compose up --force-recreate --build -d --wait
+else
+    echo "Starting the containers..."
+    docker compose up -d --wait
+fi
 
+echo "Containers are up"
 echo "SSP is now available at https://ssp.dev.openconext.local/"
+echo ""
 
-# attach to the containers's log output
-docker compose logs -f
+# Use docker compose cp to copy the /var/www directory from the ./container/ directory on the host
+echo "Copying the /var/www directory from the container to ./container"
+mkdir -p ./container/var/
+echo "docker compose cp devssp:/var/www ${DIR}/container/var/www"
+docker compose cp ssp:/var/www "${DIR}/container/var/"
+echo "Done."
+echo ""
 
+# Attach to the container's log output
+echo "Following the logs of the containers... Use Ctrl+C to stop."
+echo "The containers will continue running in the background."
+echo ""
+echo "docker compose logs -f"
+docker compose logs -f

dev-rebuild.sh

@@ -19,12 +19,6 @@ services:
       # Make the ssp configuration from OpenConext-devconf available in the container
       - ./../OpenConext-devconf/stepup/ssp:/var/www/simplesaml/config/cert/
 
-      # A copy of the /var/www/simplesaml/ directory to make this available to the host
-      - ./container-files/simplesaml:/simplesaml/
-
-      # Contains the sync script that is used to make the copy.
-      - ./container-files/scripts:/scripts/
-
 networks:
   # create a local only network for the devssp container
   devsp_network: