Merge pull request #211 from silinternational/feature/misc

development and test adjustments

.github/workflows/test-and-publish.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: test
-        run: docker-compose -f actions-services.yml run --rm app ./run-tests.sh
+        run: docker-compose -f actions-services.yml run --rm test ./run-tests.sh
       - name: check hub metadata for tests
         run: docker-compose -f actions-services.yml run --rm ssp-hub.local ./run-metadata-tests.sh
       - name: check idp metadata for tests

Dockerfile

@@ -34,10 +34,11 @@ RUN curl https://raw.githubusercontent.com/silinternational/s3-expand/1.5/s3-exp
 WORKDIR /data
 
 # Install/cleanup composer dependencies
+ARG COMPOSER_FLAGS="--prefer-dist --no-interaction --no-dev --optimize-autoloader --no-scripts --no-progress"
 COPY composer.json /data/
 COPY composer.lock /data/
 RUN composer self-update --no-interaction
-RUN COMPOSER_ALLOW_SUPERUSER=1 composer install --prefer-dist --no-interaction --no-dev --optimize-autoloader --no-scripts --no-progress
+RUN COMPOSER_ALLOW_SUPERUSER=1 composer install $COMPOSER_FLAGS
 
 ENV SSP_PATH /data/vendor/simplesamlphp/simplesamlphp
 

README.md

@@ -40,6 +40,26 @@ will overwrite variables set in the execution environment.
 4. `make` or `docker-compose up -d` within the project root.
 5. Visit http://ssp-hub.local to see SimpleSAMLphp 
 
+### Configure a container for debugging with Xdebug
+
+1. Add a volume map for run-debug.sh on the container you wish to debug.
+
+```yml
+    - ./development/run-debug.sh:/data/run-debug.sh
+```
+
+2. Add or change the `command` for the container.
+
+```yml
+    command: /data/run-debug.sh
+```
+
+3. Restart the container.
+
+```shell
+docker composer up -d ssp-hub.local
+```
+
 ### Setup PhpStorm for remote debugging with Docker
 
 1. Make sure you're running PhpStorm 2016.3 or later

actions-services.yml

@@ -10,8 +10,11 @@ services:
       MYSQL_USER: silauth
       MYSQL_PASSWORD: silauth
 
-  app:
-    build: .
+  test:
+    build:
+      context: .
+      args:
+        COMPOSER_FLAGS: "--no-interaction --no-progress"
     depends_on:
       - ssp-hub.local
       - ssp-idp1.local

docker-compose.yml

@@ -19,7 +19,10 @@ services:
       PMA_PASSWORD: silauth
 
   test:
-    build: .
+    build:
+      context: .
+      args:
+        COMPOSER_FLAGS: "--no-interaction --no-progress"
     depends_on:
       - ssp-hub.local
       - ssp-idp1.local
@@ -104,9 +107,6 @@ services:
       - ./development/hub/metadata/saml20-sp-hosted.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-sp-hosted.php
       - ./development/hub/metadata/sp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/sp-remote.php
 
-      # Configure the debugger
-      - ./development/hub/run-debug.sh:/data/run-debug.sh
-
       # Enable checking our test metadata
       - ./dockerbuild/run-metadata-tests.sh:/data/run-metadata-tests.sh
 
@@ -117,7 +117,6 @@ services:
       - ./modules/silauth:/data/vendor/simplesamlphp/simplesamlphp/modules/silauth
       - ./modules/sildisco:/data/vendor/simplesamlphp/simplesamlphp/modules/sildisco
       - ./modules/material:/data/vendor/simplesamlphp/simplesamlphp/modules/material
-    command: /data/run-debug.sh
     ports:
       - "80:80"
     environment:

dockerbuild/run-integration-tests.sh

@@ -7,7 +7,6 @@ set -x
 set -e
 
 cd /data
-export COMPOSER_ALLOW_SUPERUSER=1; composer install
 
 whenavail "ssp-hub.local"  80 15 echo Hub ready
 whenavail "ssp-idp1.local" 80 5 echo IDP 1 ready