Merge branch 'development'

ConductionNL · Jan 7, 2020 · 1ed2a00 · 1ed2a00
2 parents 6dce3b7 + fa1a05a
commit 1ed2a00
Show file tree

Hide file tree

Showing 38 changed files with 2,245 additions and 2,062 deletions.
diff --git a/.env b/.env
@@ -23,15 +23,19 @@ APP_BUILD=dev
 # The description for this api
 APP_DESCRIPTION='Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar.'
 
+
+APP_LOGO=pc.zaakonline.nl
+APP_HOME=pc.zaakonline.nl
+
 # The urls on wich this api is available
 TRUSTED_PROXIES=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
-TRUSTED_HOSTS=^(.+\.)?conduction\.nl$|^(.+\.)?huwelijksplanner\.online$|^(.+\.)?larping\.eu$|^(.+\.)?common-ground\.nl$|^(.+\.)?trouwplanner\.online$|^(.+\.)?zaakonline\.nl$|localhost
+TRUSTED_HOSTS=^(.+\.)?conduction\.nl$|^(.+\.)?huwelijksplanner\.online$|^(.+\.)?larping\.eu$|^(.+\.)?common-ground\.dev$|^(.+\.)?trouwplanner\.online$|^(.+\.)?zaakonline\.nl$|localhost
 
 ##################################################
 # Orgization details
 ##################################################
 
-# The following details describe your organisations and are used for both certificate creation and common-ground.dev
+# The following details describe your organisations and are used for both certificate creation, nlx (if active) and common-ground.dev
 
 ORGANIZATION_NAME=Conduction
 ORGANIZATION_EMAIL_ADDRESS=[email protected]
@@ -45,6 +49,8 @@ ORGANIZATION_UNIT_NAME=Common-Ground
 ##################################################
 
 APP_DOMAIN=conduction.nl
+# The domains on wich you want to provide this component, the first wil be used as primary (or common in cert-manger terms)
+APP_DOMAINS=["conduction.nl","zaakonline.nl","huwelijksplanner.online","common-ground.dev"]
 APP_DEMO=vtc.zaakonline.nl
 APP_REPRO=https://github.com/ConductionNL/verzoektypecatalogus
 
@@ -70,7 +76,7 @@ NOTIFICATION_ENABLED_AUTHORIZATION=sasd
 ##################################################
 
 AUTH_ENABLED=false
-AUTH_PROVIDER=sasd
+AUTH_PROVIDER=sasdadad
 AUTH_AUTHORIZATION=sasd
 
 ##################################################

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -19,8 +19,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Pulling old images, if any
-        run: docker-compose pull --ignore-pull-failures
       - name: Setting APP_NAME
         run: | 
             export NAME=$(grep APP_NAME= .env | cut -d '=' -f2)
@@ -36,6 +34,7 @@ jobs:
         if: contains( github.ref, 'master' ) || contains( github.base_ref, 'master' )
         run: |
             echo ::set-env name=APP_ENV::prod
+            echo ::set-env name=APP_BUILD::prod
             echo "set APP_ENV to $APP_ENV"
       - name: Set APP_BUILD to APP_VERSION
         if: contains( github.ref, 'master' )
@@ -55,18 +54,21 @@ jobs:
         run: docker-compose build --pull --build-arg APP_ENV=$APP_ENV --build-arg APP_BUILD=$APP_BUILD
       - name: Run the docker image
         run: docker-compose up -d
-      - name: Taking some sleep
-        run: sleep 100
+      - name: Taking some sleep (for containers to come up)
+        run: sleep 200
       - name: Check if all containers are running
         run: docker ps
       - name: Dumping the logs
         run: docker-compose logs
-      - name: Security Checks
-        run: docker-compose exec -T php composer req sensiolabs/security-checker
       - name: Database Update
         run: docker-compose exec -T php bin/console doctrine:schema:update --force
-      - name: Database Check
-        run: docker-compose exec -T php bin/console doctrine:schema:validate
+      #- name: Taking some more sleep (for database to be updated)
+      #  run: sleep 20
+      #- name: Database Check
+      #  run: docker-compose exec -T php bin/console doctrine:schema:validate
+      - name: Security Checks
+        run: docker-compose exec -T php composer req sensiolabs/security-checker
+
       - name: Chores
         run: docker-compose down
       - name: Login to DockerHub Registry
@@ -99,7 +101,7 @@ jobs:
         if: (contains( github.ref, 'master' ) || contains( github.ref, 'staging' ) || contains( github.ref, 'development' )) && steps.kubeconfig.outputs.success == 'true'
         run: helm upgrade $APP_NAME-$APP_ENV ./api/helm  --kubeconfig="kubeconfig.yaml" --namespace=$APP_ENV  --set settings.env=$APP_ENV,settings.debug=1
       - name: Install through helm
-        if: failure()
+        if: failure() && (contains( github.ref, 'master' ) || contains( github.ref, 'staging' ) || contains( github.ref, 'development' )) && steps.kubeconfig.outputs.success == 'true'
         run: helm install --name $APP_NAME-$APP_ENV ./api/helm  --kubeconfig="kubeconfig.yaml" --namespace=$APP_ENV  --set settings.env=$APP_ENV,settings.debug=1 
       - name: Rollout new containers
         if: (contains( github.ref, 'master' ) || contains( github.ref, 'staging' ) || contains( github.ref, 'development' )) && steps.kubeconfig.outputs.success == 'true' && success()