Commit 077a8537 authored by Malin, James (Contractor) Christopher's avatar Malin, James (Contractor) Christopher
Browse files

Merge branch 'trigger' into 'master'

Trigger

See merge request !27
parents d0c47cc5 9cdd0113
Pipeline #860 passed with stages
in 19 seconds
...@@ -57,6 +57,35 @@ stages: ...@@ -57,6 +57,35 @@ stages:
# - publish-image # - publish-image
- trigger_deploy - 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 ######
build: build:
stage: build stage: build
...@@ -182,8 +211,10 @@ trigger deploy: ...@@ -182,8 +211,10 @@ trigger deploy:
# BUILD_ID: $${BUILD_ID} # BUILD_ID: $${BUILD_ID}
image: node:latest image: node:latest
stage: trigger_deploy stage: trigger_deploy
when: manual
only: only:
- merge_requests - merge_requests
- master
# trigger: jmalin/container-deploy # trigger: jmalin/container-deploy
script: script:
- 'curl -X POST - 'curl -X POST
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment