Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch "dev" into branch "staging" #1288

Merged
merged 12 commits into from
Jun 18, 2024
Merged

Merge branch "dev" into branch "staging" #1288

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
836bee6
ui - add workarounds for HTTPS-only setup wizard
fl0ppy-d1sk Jun 17, 2024
c05668e
ui - force HTTPS everytime
fl0ppy-d1sk Jun 17, 2024
8bba38d
chore: Increase graceful timeout to 30 seconds and handle server stop…
TheophileDiot Jun 18, 2024
41e68ff
deps/gha: bump docker/build-push-action from 5.4.0 to 6.0.0
dependabot[bot] Jun 18, 2024
a9efe76
deps/gha: bump aquasecurity/trivy-action from 0.22.0 to 0.23.0
dependabot[bot] Jun 18, 2024
fec30c0
deps/gha: bump ruby/setup-ruby from 1.180.0 to 1.180.1
dependabot[bot] Jun 18, 2024
5a1d88d
chore: Update urllib3 dependency to version 2.2.2
TheophileDiot Jun 18, 2024
774f239
chore: Fix permission issues when gunicorn master creates the .ui.jso…
TheophileDiot Jun 18, 2024
9b2805a
chore: Update Database.py to set custom_configs_changed flag and last…
TheophileDiot Jun 18, 2024
d0640d5
Merge pull request #1287 from bunkerity/dependabot/github_actions/dev…
TheophileDiot Jun 18, 2024
8bf1bae
Merge pull request #1286 from bunkerity/dependabot/github_actions/dev…
TheophileDiot Jun 18, 2024
c5a1d8f
Merge pull request #1285 from bunkerity/dependabot/github_actions/dev…
TheophileDiot Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
deps/gha: bump aquasecurity/trivy-action from 0.22.0 to 0.23.0 
Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.22.0 to 0.23.0.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](aquasecurity/trivy-action@595be6a...7c2007b)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
  • Loading branch information
@dependabot
dependabot[bot] authored Jun 18, 2024
commit a9efe76e1a865a05aa173f5eaa79eedaf9c8ea8d
2 changes: 1 addition & 1 deletion .github/workflows/container-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
# Check OS vulnerabilities
- name: Check OS vulnerabilities
if: ${{ inputs.CACHE_SUFFIX != 'arm' }}
uses: aquasecurity/trivy-action@595be6a0f6560a0a8fc419ddf630567fc623531d # v0.22.0
uses: aquasecurity/trivy-action@7c2007bcb556501da015201bcba5aa14069b74e2 # v0.23.0
with:
vuln-type: os
skip-dirs: /root/.cargo
Expand Down