diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000000..378a7a17495 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,70 @@ +version: 2.1 +orbs: + snyk: snyk/snyk@0.0.8 + +workflows: #creating a workflow to define the context - collection of different jobs + test-env-vars: #setting up a job to define the context which this project will use + jobs: + - build-test-monitor-app: #building the relevant context + context: Snyk # has an env var called Snyk-Token + - build-test-monitor-docker: + context: Snyk + + +jobs: # a collection of steps + build-test-monitor-app: # runs not using Workflows must have a `build` job as entry point #directory where steps will run + working_directory: ~/goof + docker: + - image: circleci/node:4.8.2 + steps: + - checkout + - run: + name: echo "install and build npm project" + command: 'sudo npm install -q' + - run: + name: echo "build project" + command: 'npm run build' + #- run: + # name: echo "build Docker image" + # command: 'docker build -t my-new-container-goof-image .' + - snyk/scan: + fail-on-issues: false + monitor-on-build: true + token-variable: SNYKTOKEN + organization: panda-not-omar + project: circleCi-goof + severity-threshold: high + + + build-test-monitor-docker: # runs not using Workflows must have a `build` job as entry point #directory where steps will run + #working_directory: ~/goof + docker: + - image: circleci/buildpack-deps:stretch + environment: + IMAGE_NAME: akanchhaS/goof + steps: + - checkout + - setup_remote_docker + - run: + name: echo "Build Docker image" + command: 'docker build -t my-new-container-circleci-goof-image .' + - snyk/scan: + fail-on-issues: false + monitor-on-build: true + token-variable: SNYKTOKEN + organization: panda-not-omar + project: circleCi-goof-container + severity-threshold: low + target-file: Dockerfile + docker-image-name: my-new-container-circleci-goof-image + +#workflows: + #node-tests: + #jobs: + # - node/test + #- snyk/scan: + # fail-on-issues: false + # monitor-on-build: true + # token-variable: SNYKTOKEN + # organization: panda-not-omar + # project: circleCi-dotnet-goof \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2784b7e4f6a..7ab6b5561d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3312,9 +3312,9 @@ } }, "marked": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.5.tgz", - "integrity": "sha1-QROhWsXXvKFYpargciRYe5+hW5Q=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.1.tgz", + "integrity": "sha512-5XFS69o9CzDpQDSpUYC+AN2xvq8yl1EGa5SG/GI1hP78/uTeo3PDfiDNmsUyiahpyhToDDJhQk7fNtJsga+KVw==" }, "md5.js": { "version": "1.3.5", diff --git a/package.json b/package.json index da13bc85d2f..26b7d11ef45 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "humanize-ms": "1.0.1", "jquery": "^2.2.4", "lodash": "4.17.4", - "marked": "0.3.5", + "marked": "2.1.1", "method-override": "latest", "moment": "2.15.1", "mongodb": "^3.5.9",