Skip to content

Commit

Permalink
Merge branch 'master' into muellerst-hg-entrypoint-mount
Browse files Browse the repository at this point in the history
  • Loading branch information
muellerst-hg committed Jun 13, 2023
2 parents 89c06eb + 94d1dc5 commit 30d5b85
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/_meta-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,16 @@ jobs:
name: assembled-frontend-node${{ inputs.node-version-package }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v2.1.0
uses: docker/setup-qemu-action@v2.2.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2.5.0
uses: docker/setup-buildx-action@v2.6.0
id: buildx
with:
install: true

- name: Login to Docker.io
uses: docker/login-action@v2.1.0
uses: docker/login-action@v2.2.0
if: ${{ inputs.publish-container }}
with:
registry: docker.io
Expand All @@ -100,10 +100,10 @@ jobs:
if [[ "${{ inputs.app-version }}" != "snapshot" ]]; then
TAGS="${TAGS},docker.io/dependencytrack/frontend:latest"
fi
echo "::set-output name=tags::${TAGS}"
echo "tags=${TAGS}" >> $GITHUB_OUTPUT
- name: Build multi-arch Container Image
uses: docker/build-push-action@v3.3.0
uses: docker/build-push-action@v4.1.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.10.0
uses: aquasecurity/trivy-action@0.11.2
with:
image-ref: docker.io/dependencytrack/frontend:${{ inputs.app-version }}
format: 'sarif'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
id: parse
run: |-
VERSION=`jq -r '.version' package.json`
echo "::set-output name=version::${VERSION}"
echo "version=${VERSION}" >> $GITHUB_OUTPUT
call-build:
needs:
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.23.4-alpine@sha256:df58824bd9265c109be17e01cec9f518d1d2de4bfb94f605b053b052209d73f5
FROM nginxinc/nginx-unprivileged:1.25.0-alpine@sha256:5f3b69f93539adfce3b9a740bed693cb5749aab00b046872b5ff1478c2f3e97b

# Arguments that can be passed at build time
ARG COMMIT_SHA=unknown
Expand Down
1 change: 1 addition & 0 deletions docker/etc/nginx/conf.d/default.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
server {
listen 8080;
listen [::]:8080;
server_name _;

location / {
Expand Down

0 comments on commit 30d5b85

Please sign in to comment.