Skip to content

Commit

Permalink
Remove trivy as it just does not work
Browse files Browse the repository at this point in the history
  • Loading branch information
antoinejaussoin committed Nov 7, 2024
1 parent b687b3a commit 641d464
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 83 deletions.
32 changes: 0 additions & 32 deletions .github/workflows/alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,35 +131,3 @@ jobs:
name: Test videos
path: integration/cypress/videos/
retention-days: 14

trivy:
runs-on: ubuntu-latest
needs: [frontend, backend, marketing]
steps:
- name: Trivy - Frontend
uses: aquasecurity/[email protected]
with:
image-ref: retrospected/frontend:alpha
format: "table"
exit-code: "1"
ignore-unfixed: true
vuln-type: "os,library"
severity: "CRITICAL"
- name: Trivy - Backend
uses: aquasecurity/[email protected]
with:
image-ref: retrospected/backend:alpha
format: "table"
exit-code: "1"
ignore-unfixed: true
vuln-type: "os,library"
severity: "CRITICAL"
- name: Trivy - Marketing
uses: aquasecurity/[email protected]
with:
image-ref: retrospected/marketing:alpha
format: "table"
exit-code: "1"
ignore-unfixed: true
vuln-type: "os,library"
severity: "CRITICAL"
32 changes: 0 additions & 32 deletions .github/workflows/canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,35 +159,3 @@ jobs:
name: Test videos
path: integration/cypress/videos/
retention-days: 14

trivy:
runs-on: ubuntu-latest
needs: [frontend, backend, marketing]
steps:
- name: Trivy - Frontend
uses: aquasecurity/[email protected]
with:
image-ref: retrospected/frontend:canary
format: "table"
exit-code: "1"
ignore-unfixed: true
vuln-type: "os,library"
severity: "CRITICAL"
- name: Trivy - Backend
uses: aquasecurity/[email protected]
with:
image-ref: retrospected/backend:canary
format: "table"
exit-code: "1"
ignore-unfixed: true
vuln-type: "os,library"
severity: "CRITICAL"
- name: Trivy - Marketing
uses: aquasecurity/[email protected]
with:
image-ref: retrospected/marketing:canary
format: "table"
exit-code: "1"
ignore-unfixed: true
vuln-type: "os,library"
severity: "CRITICAL"
17 changes: 0 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,6 @@ marketing-build:
docker build -f ./marketing/Dockerfile -t retrospected/marketing:local ./marketing
docker run -it --rm -p 3333:80 retrospected/marketing:local

install-trivy:
brew install trivy

trivy-f:
docker build -f ./frontend/Dockerfile -t retrospected/frontend:trivy ./frontend
trivy image retrospected/frontend:trivy --security-checks vuln

trivy-b:
docker build -f ./backend/Dockerfile -t retrospected/backend:trivy ./backend
trivy image retrospected/backend:trivy --security-checks vuln

trivy:
docker build -f ./backend/Dockerfile -t retrospected/backend:trivy ./backend
docker build -f ./frontend/Dockerfile -t retrospected/frontend:trivy ./frontend
trivy image retrospected/backend:trivy --security-checks vuln
trivy image retrospected/frontend:trivy --security-checks vuln

translate:
crowdin push sources
crowdin pre-translate --method=mt --engine-id=316468 -l=fr -l=nl -l=ar -l=de -l=it -l=ja -l=uk
Expand Down
8 changes: 7 additions & 1 deletion integration/docker-compose.ci.canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ services:
image: retrospected/backend:canary
depends_on:
- redis
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3201/healthz"]
interval: 2s
timeout: 5s
retries: 30
environment:
SELF_HOSTED_ADMIN: '[email protected]'
DB_PASSWORD: some-password
Expand All @@ -43,7 +48,8 @@ services:
frontend:
image: retrospected/frontend:canary
depends_on:
- backend
backend:
condition: service_healthy
restart: unless-stopped
logging:
driver: 'json-file'
Expand Down
8 changes: 7 additions & 1 deletion integration/docker-compose.ci.master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ services:
image: retrospected/backend:latest
depends_on:
- redis
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3201/healthz"]
interval: 2s
timeout: 5s
retries: 30
environment:
SELF_HOSTED_ADMIN: '[email protected]'
DB_PASSWORD: some-password
Expand All @@ -43,7 +48,8 @@ services:
frontend:
image: retrospected/frontend:latest
depends_on:
- backend
backend:
condition: service_healthy
restart: unless-stopped
logging:
driver: 'json-file'
Expand Down

0 comments on commit 641d464

Please sign in to comment.