Skip to content

Commit

Permalink
Merge branch 'master' into i18n
Browse files Browse the repository at this point in the history
Signed-off-by: Marlon Pina Tojal <[email protected]>
  • Loading branch information
fnxpt authored Apr 5, 2024
2 parents 4055cdd + f7de594 commit da214cf
Show file tree
Hide file tree
Showing 29 changed files with 1,011 additions and 548 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/_meta-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/[email protected].1
uses: actions/[email protected].2

- name: Set up NodeJs
uses: actions/[email protected]
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/[email protected].1
uses: actions/[email protected].2

- name: Download Artifacts
uses: actions/[email protected]
Expand All @@ -79,13 +79,13 @@ jobs:
uses: docker/[email protected]

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.1.0
uses: docker/setup-buildx-action@v3.2.0
id: buildx
with:
install: true

- name: Login to Docker.io
uses: docker/login-action@v3.0.0
uses: docker/login-action@v3.1.0
if: ${{ inputs.publish-container }}
with:
registry: docker.io
Expand All @@ -103,7 +103,7 @@ jobs:
echo "tags=${TAGS}" >> $GITHUB_OUTPUT
- name: Build multi-arch Container Image
uses: docker/build-push-action@v5.1.0
uses: docker/build-push-action@v5.3.0
with:
tags: ${{ steps.tags.outputs.tags }}
build-args: |-
Expand All @@ -116,7 +116,7 @@ jobs:

- name: Run Trivy Vulnerability Scanner
if: ${{ inputs.publish-container }}
uses: aquasecurity/trivy-action@0.18.0
uses: aquasecurity/trivy-action@0.19.0
with:
image-ref: docker.io/dependencytrack/frontend:${{ inputs.app-version }}
format: 'sarif'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fi
- name: Checkout Repository
uses: actions/[email protected].1
uses: actions/[email protected].2

- name: Parse Version from package.json
id: parse
Expand All @@ -46,7 +46,7 @@ jobs:
- call-build
steps:
- name: Checkout Repository
uses: actions/[email protected].1
uses: actions/[email protected].2

- name: Download Artifacts
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/[email protected].1
uses: actions/[email protected].2

- name: Set up NodeJs
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/[email protected].1
uses: actions/[email protected].2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/[email protected].1
uses: actions/[email protected].2

- name: Dependency Review
uses: actions/dependency-review-action@v4
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/[email protected].1
uses: actions/[email protected].2

- name: Set up NodeJs
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Note to developers: Textual labels are defined in `src/i18n/locales/{lang}.json`

## Copyright & License

Dependency-Track is Copyright (c) Steve Springett. All Rights Reserved.
Dependency-Track is Copyright (c) OWASP Foundation. All Rights Reserved.

Permission to modify and redistribute is granted under the terms of the
Apache 2.0 license. See the [LICENSE] file for the full license.
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginxinc/nginx-unprivileged:1.25.4-alpine@sha256:c50bd1116f195ac5c10a84c008ced70afec201508433701967e35e565cfb0a6b
FROM nginxinc/nginx-unprivileged:1.25.4-alpine@sha256:e5a49a7c7ce0b31af96bf676a3b8e7ef2f6ac1de62c86d9c84bc8083fa402948

# Arguments that can be passed at build time
ARG COMMIT_SHA=unknown
Expand Down
Loading

0 comments on commit da214cf

Please sign in to comment.