Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 11da1e4

Browse files
spikecurtisspikecurtis
committedJun 21, 2023
Merge branch 'main' of https://github.com/coder/coder into spike/7961-ssh-connection-logs
2 parents 0eb01c2 + 4a431b6 commit 11da1e4

File tree

94 files changed

+2503
-1684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+2503
-1684
lines changed
 

‎.github/workflows/security.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,15 @@ jobs:
125125
pcc_pass: ${{ secrets.PRISMA_CLOUD_SECRET_KEY }}
126126
image_name: ${{ steps.build.outputs.image }}
127127

128+
- name: Scan image
129+
id: sysdig-scan
130+
uses: sysdiglabs/scan-action@v3
131+
with:
132+
image-tag: ${{ steps.build.outputs.image }}
133+
sysdig-secure-token: ${{ secrets.SYSDIG_API_TOKEN }}
134+
input-type: docker-daemon
135+
sysdig-secure-url: https://app.us4.sysdig.com
136+
128137
- name: Run Trivy vulnerability scanner
129138
uses: aquasecurity/trivy-action@41f05d9ecffa2ed3f1580af306000f734b733e54
130139
with:

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ coderd/database/dump.sql: coderd/database/gen/dump/main.go $(wildcard coderd/dat
486486
go run ./coderd/database/gen/dump/main.go
487487

488488
# Generates Go code for querying the database.
489-
coderd/database/querier.go: coderd/database/sqlc.yaml coderd/database/dump.sql $(wildcard coderd/database/queries/*.sql) coderd/database/gen/enum/main.go coderd/database/gen/fake/main.go
489+
coderd/database/querier.go: coderd/database/sqlc.yaml coderd/database/dump.sql $(wildcard coderd/database/queries/*.sql)
490490
./coderd/database/generate.sh
491491

492492

There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.