Merge branch 'trigger' into 'master'

Trigger

See merge request !27

.gitlab-ci.yml

@@ -57,6 +57,35 @@ stages:
   # - publish-image
   - trigger_deploy
 
+
+
+  # ADD IN METADATA.json for tagging, etc.
+
+# stage('Build Image') {
+#       def info = [:]
+#       def pkgInfo = readJSON file: 'package.json'
+
+#       info.version = pkgInfo.version
+#       info.branch = SCM_VARS.GIT_BRANCH
+#       info.commit = SCM_VARS.GIT_COMMIT
+#       info.image = IMAGE_VERSION
+
+#       // Convert from Map --> JSON
+#       info = readJSON text: groovy.json.JsonOutput.toJson(info)
+#       writeJSON file: 'metadata.json', pretty: 4, json: info
+
+#       // Build candidate image for later penetration testing
+#       ansiColor('xterm') {
+#         sh """
+#           docker build \
+#             --build-arg FROM_IMAGE=${BASE_IMAGE} \
+#             --build-arg BUILD_IMAGE=${BUILDER_IMAGE} \
+#             -t ${LOCAL_IMAGE} \
+#             .
+#         """
+#       }
+#     }
+
     ###### Build ######
 build:
   stage: build
@@ -182,8 +211,10 @@ trigger deploy:
   #   BUILD_ID: $${BUILD_ID}
   image: node:latest
   stage: trigger_deploy
+  when: manual
   only:
     - merge_requests
+    - master
   # trigger: jmalin/container-deploy
   script:
      - 'curl -X POST