Merge pull request #213 from Amsterdam/dpsecure

Sync master
Schulddossier · Aug 25, 2020 · 50ddb48 · 50ddb48
2 parents f5ba19d + ba6831d
commit 50ddb48
Show file tree

Hide file tree

Showing 682 changed files with 39,597 additions and 24,306 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,5 +33,4 @@ docker-compose-dev.override.yml
 ###< symfony/web-server-bundle ###
 /public/scss/.sass-cache
 
-config/soap-client-allegro-login.php
-config/soap-client-allegro-schuldhulp.php
+config/soap-client-allegro-login.php
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,10 +1,11 @@
+#!groovy
+
 def tryStep(String message, Closure block, Closure tearDown = null) {
     try {
         block()
     }
     catch (Throwable t) {
-//        slackSend message: "${env.JOB_NAME}: ${message} failure ${env.BUILD_URL}", channel: '#ci-channel-app', color: 'danger'
-
+        slackSend message: "${env.JOB_NAME}: ${message} failure ${env.BUILD_URL}", channel: '#ci-channel-app', color: 'danger'
         throw t
     }
     finally {
@@ -40,24 +41,21 @@ node {
             echo 'end git version'
             def image = docker.build("${IMAGE_NAME}")
             image.push()
-
         }
     }
 }
 
-
-
 String BRANCH = "${env.BRANCH_NAME}"
 
-if (BRANCH == "master") {
+if (BRANCH == "dpsecure") {
 
     node {
         stage('Push acceptance image') {
             tryStep "image tagging", {
                 def image = docker.image("${IMAGE_NAME}")
                 image.pull()
-                image.push("acceptance")
-                image.push("production")
+                image.push("acceptance")  // temporary: we do not want to deploy to, or tag for, ACC now
+                //image.push("production")  // permanent: we never want to tag for PROD here
             }
         }
     }
@@ -74,7 +72,6 @@ if (BRANCH == "master") {
         }
     }
 
-
     stage('Waiting for approval') {
         slackSend channel: '#ci-channel-app', color: 'warning', message: 'schuldhulp is waiting for Production Release - please confirm'
         input "Deploy to Production?"
@@ -86,7 +83,7 @@ if (BRANCH == "master") {
                 def image = docker.image("${IMAGE_NAME}")
                 image.pull()
                 image.push("production")
-                image.push("latest")
+                //image.push("latest")
             }
         }
     }

diff --git a/composer.json b/composer.json
@@ -21,28 +21,32 @@
         "php-http/httplug": "^1.1",
         "php-http/message": "^1.6",
         "php-http/message-factory": "^1.0",
-        "phpoffice/phpspreadsheet": "1.2.0",
         "phpro/soap-client": "^1.0",
+        "phpoffice/phpspreadsheet": "1.2.*",
         "phpseclib/phpseclib": "^2.0",
         "psr/http-message": "^1.0",
         "rollerworks/password-strength-validator": "^1.1",
         "sensio/framework-extra-bundle": "^5.1",
-        "symfony/asset": "^4.0",
-        "symfony/console": "^4.0",
+        "symfony/asset": "4.2.*",
+        "symfony/console": "4.2.*",
+        "symfony/cache": "4.2.*",
         "symfony/debug-pack": "^1.0",
         "symfony/expression-language": "^4.0",
         "symfony/flex": "^1.0",
-        "symfony/form": "^4.0",
-        "symfony/framework-bundle": "^4.0",
+        "symfony/form": "4.2.*",
+        "symfony/framework-bundle": "4.2.*",
         "symfony/maker-bundle": "^1.1",
         "symfony/monolog-bundle": "^3.1",
         "symfony/orm-pack": "^1.0",
         "symfony/profiler-pack": "^1.0",
-        "symfony/proxy-manager-bridge": "^4.0",
-        "symfony/security-bundle": "^4.0",
+        "symfony/proxy-manager-bridge": "4.2.*",
+        "symfony/dependency-injection": "4.2.*",
+        "symfony/http-foundation": "4.2.*",
+        "symfony/security-bundle": "4.2.*",
+        "symfony/security": "4.2.*",
         "symfony/serializer": "^4.0",
         "symfony/swiftmailer-bundle": "^3.2",
-        "symfony/templating": "^4.0",
+        "symfony/templating": "4.2.*",
         "symfony/validator": "^4.0",
         "symfony/var-dumper": "^4.0",
         "symfony/workflow": "^4.0",