Skip to content

Commit

Permalink
Merge branch 'snyk-labs:main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
subsy authored Nov 23, 2023
2 parents dc77cd5 + d240896 commit 86d8d8b
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snyk-code-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
permissions:
security-events: write
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Upload SARIF
uses: github/codeql-action/upload-sarif@v1
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: sarif.json
# sarif_file: example111.json
4 changes: 2 additions & 2 deletions .github/workflows/snyk-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: snyk/actions/setup@master
- name: Snyk Test
run: snyk code test --org=${{ secrets.SNYK_ORG }} --sarif > snyk-sarif2.json
continue-on-error: true
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
- name: Upload SARIF file
uses: github/codeql-action/upload-sarif@v1
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: snyk-sarif2.json
4 changes: 2 additions & 2 deletions .github/workflows/snyk-test-sarif.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: snyk/actions/setup@master
- name: Snyk Test
run: snyk test --sarif-file-output=snyk-sarif1.json
continue-on-error: true
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
- name: Upload SARIF file
uses: github/codeql-action/upload-sarif@v1
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: snyk-sarif1.json
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# FROM node:6-stretch
FROM node:14.1.0
FROM node:18.13.0

RUN mkdir /usr/src/goof
RUN mkdir /tmp/extracted_files
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ npm start
```
This will run Goof locally, using a local mongo on the default port and listening on port 3001 (http://localhost:3001)

Note: You *have* to use an old version of MongoDB version due to some of these old libraries' database server APIs. MongoDB 3 is known to work ok.

You can also run the MongoDB server individually via Docker, such as:

```sh
docker run --rm -p 27017:27017 mongo:3
```

## Running with docker-compose
```bash
docker-compose up --build
Expand Down
5 changes: 2 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@ services:
- goof-mongo
goof-mongo:
container_name: goof-mongo
image: mongo
image: mongo:3
ports:
- "27017:27017"
good-mysql:
container_name: goof-mysql
platform: linux/x86_64
image: mysql:5
environment:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: acme
ports:
- "3306:3306"
- "3306:3306"
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"url": "https://github.com/Snyk/snyk-todo-list-demo-app/"
},
"scripts": {
"dev": "nodemon ./app.js",
"start": "node app.js",
"dev": "NODE_OPTIONS=--openssl-legacy-provider nodemon ./app.js",
"start": "NODE_OPTIONS=--openssl-legacy-provider node app.js",
"build": "browserify -r jquery > public/js/bundle.js",
"cleanup": "mongo express-todo --eval 'db.todos.remove({});'",
"test": "snyk test"
Expand Down

0 comments on commit 86d8d8b

Please sign in to comment.