Skip to content

Commit

Permalink
Merge branch 'main' into 915
Browse files Browse the repository at this point in the history
  • Loading branch information
cmwylie19 committed Jul 11, 2024
2 parents 59733e7 + 5e4ae8e commit 0870d2f
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/vulnerability-scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Build Pepr Dev Image
run: npm run build:image
- name: Scan image
uses: anchore/scan-action@3343887d815d7b07465f6fdcd395bd66508d486a # v3.6.4
uses: anchore/scan-action@04b73ec0bba3de85519c4ec634bffedead788f96 # v4.0.0
with:
image: "pepr:dev"
fail-build: true
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Any other changes to Dockerfile should be reflected in Publish

# crane digest cgr.dev/chainguard/node-lts:latest-dev
FROM cgr.dev/chainguard/node-lts@sha256:691fdeb1c1e7fbd76adb7156655f6083dd352720fc2cbd5848cd22faca7a0ced AS build
FROM cgr.dev/chainguard/node-lts@sha256:ea8ec8f98456b42cd65e965cf194cf45ed140e5ce236cd73539cf717fb2d1379 AS build

WORKDIR /app

Expand Down Expand Up @@ -38,7 +38,7 @@ RUN npm run build && \
##### DELIVER #####

# crane digest cgr.dev/chainguard/node-lts:latest
FROM cgr.dev/chainguard/node-lts@sha256:691fdeb1c1e7fbd76adb7156655f6083dd352720fc2cbd5848cd22faca7a0ced
FROM cgr.dev/chainguard/node-lts@sha256:ea8ec8f98456b42cd65e965cf194cf45ed140e5ce236cd73539cf717fb2d1379

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dist
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Any other changes to Dockerfile should be reflected in Publish

# crane digest cgr.dev/chainguard/node-lts:latest-dev
FROM cgr.dev/chainguard/node-lts@sha256:691fdeb1c1e7fbd76adb7156655f6083dd352720fc2cbd5848cd22faca7a0ced AS build
FROM cgr.dev/chainguard/node-lts@sha256:ea8ec8f98456b42cd65e965cf194cf45ed140e5ce236cd73539cf717fb2d1379 AS build

WORKDIR /app

Expand Down
86 changes: 78 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@types/ramda": "0.30.1",
"express": "4.19.2",
"fast-json-patch": "3.1.1",
"kubernetes-fluent-client": "2.6.3",
"kubernetes-fluent-client": "2.6.4",
"pino": "9.2.0",
"pino-pretty": "11.2.1",
"prom-client": "15.1.3",
Expand All @@ -55,7 +55,7 @@
"@types/uuid": "10.0.0",
"jest": "29.7.0",
"nock": "13.5.4",
"ts-jest": "29.2.0"
"ts-jest": "29.2.2"
},
"peerDependencies": {
"@typescript-eslint/eslint-plugin": "6.15.0",
Expand Down

0 comments on commit 0870d2f

Please sign in to comment.