diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ab4b70b..93268d0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -134,6 +134,7 @@ jobs: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} run: snyk code test + --attachments=.snyk --sarif --sarif-file-output="${SARIF_FILENAME}" --policy-path=.snyk @@ -353,6 +354,7 @@ jobs: KOSLI_FINGERPRINT: ${{ needs.build-image.outputs.fingerprint }} run: kosli attest snyk + --attachments=.snyk --name=dashboard.snyk-container-scan --scan-results="${SARIF_FILENAME}" diff --git a/Dockerfile b/Dockerfile index 9361ca5..979deec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM cyberdojo/sinatra-base:16c1478 +FROM cyberdojo/sinatra-base:db948c1 LABEL maintainer=jon@jaggersoft.com WORKDIR /dashboard diff --git a/bin/lib.sh b/bin/lib.sh index b4d17c3..c95de13 100755 --- a/bin/lib.sh +++ b/bin/lib.sh @@ -130,10 +130,10 @@ clean_top_5() { # 1st 5 lines on Puma local -r L1="Puma starting in single mode..." - local -r L2='* Puma version: 6.4.3 (ruby 3.3.6-p108) ("The Eagle of Durango")' - local -r L3="* Min threads: 0" - local -r L4="* Max threads: 5" - local -r L5="* Environment: production" + local -r L2='* Puma version: 6.5.0 ("Sky'"'"'s Version")' + local -r L3='* Ruby version: ruby 3.3.6 (2024-11-05 revision 75015d4c1f) [x86_64-linux-musl]' + local -r L4="* Min threads: 0" + local -r L5="* Max threads: 5" # local -r all5="$(printf "%s\n%s\n%s\n%s\n%s" "${L1}" "${L2}" "${L3}" "${L4}" "${L5}")" echo "${all5}" diff --git a/source/client/Dockerfile b/source/client/Dockerfile index ca3b212..484760e 100644 --- a/source/client/Dockerfile +++ b/source/client/Dockerfile @@ -1,4 +1,4 @@ -FROM cyberdojo/sinatra-base:16c1478 +FROM cyberdojo/sinatra-base:db948c1 LABEL maintainer=jon@jaggersoft.com WORKDIR /app diff --git a/test/slim_json_reporter.rb b/test/slim_json_reporter.rb index dc5c9ad..b18646b 100644 --- a/test/slim_json_reporter.rb +++ b/test/slim_json_reporter.rb @@ -8,7 +8,7 @@ def report super filename = "#{ENV.fetch('COVERAGE_ROOT')}/test_metrics.json" metrics = { - total_time: format('%.2f', total_time), + total_time: total_time.round(2), assertion_count: assertions, test_count: count, failure_count: failures,