Skip to content

Commit

Permalink
Merge pull request #140 from akanchhaS/circleci-editor/master
Browse files Browse the repository at this point in the history
Circleci editor/master
  • Loading branch information
akanchhaS authored Sep 16, 2021
2 parents 3cbcab5 + 235a451 commit b26aaac
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 16 deletions.
38 changes: 23 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2.1
orbs:
snyk: snyk/snyk@0.0.8
snyk: snyk/snyk@1.1.1

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
Expand All @@ -15,23 +15,15 @@ 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
- image: 'cimg/node:lts'
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:
- checkout
- run: npm ci
- snyk/scan:
fail-on-issues: false
monitor-on-build: true
token-variable: SNYKTOKEN
organization: panda-not-omar
organization: ninja-snyker
project: circleCi-goof
severity-threshold: high

Expand All @@ -52,11 +44,27 @@ jobs: # a collection of steps
fail-on-issues: false
monitor-on-build: true
token-variable: SNYKTOKEN
organization: panda-not-omar
organization: ninja-snyker
project: circleCi-goof-container
severity-threshold: low
target-file: Dockerfile
docker-image-name: my-new-container-circleci-goof-image
docker:
- image: 'snyk/snyk-cli:npm'
parameters:
args:
default: ''
description: >
See the Snyk CLI help page for information on additional arguments:
https://support.snyk.io/hc/en-us/articles/360003812578-CLI-reference
type: string
resource_class: medium
steps:
- checkout
- scan:
additional-arguments: ' '
command: iac test
monitor-on-build: false

#workflows:
#node-tests:
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# FROM node:6-stretch
FROM node:14.1.0
FROM node:current-alpine3.14

RUN mkdir /usr/src
RUN mkdir /usr/src/goof
RUN mkdir /tmp/extracted_files
COPY . /usr/src/goof
Expand Down

0 comments on commit b26aaac

Please sign in to comment.