Merge branch 'hypernext'

* hypernext:
  try sbom action
  add php81-iconv package, required by ldaprecord

.github/workflows/build_hypernext.yaml

@@ -8,6 +8,10 @@ on:
     schedule:
       - cron: "42 01 * * *"
 
+## GITHUB_TOKEN authentication
+permissions:
+  contents: write
+
 jobs:
     buildandpush:
         runs-on: ubuntu-latest
@@ -64,6 +68,15 @@ jobs:
                 vuln-type: 'os,library'
                 severity: 'CRITICAL,HIGH'
 
+            - name: Run Trivy in GitHub SBOM mode and submit results to Dependency Graph
+              uses: aquasecurity/trivy-action@master
+              with:
+                scan-type: 'fs'
+                format: 'github'
+                output: 'dependency-results.sbom.json'
+                image-ref: '.'
+                github-pat: ${{ secrets.GITHUB_TOKEN }}
+
               # This ugly bit is necessary if you don't want your cache to grow forever
               # till it hits GitHub's limit of 5GB.
               # Temp fix

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Container image version
 # Note: the version here is from `ELABIMG_VERSION` present in Dockerfile, not the tagged one
 
+# 4.3.0
+
+* Add php81-iconv package required by LdapRecord dependency
+
 # 4.2.1
 
 * Make 404 page lighter

Dockerfile

@@ -108,7 +108,7 @@ RUN abuild-keygen -n -a && abuild && find /home/builder/packages -type f -name '
 FROM alpine:3.16
 
 # this is versioning for the container image
-ENV ELABIMG_VERSION=4.2.1
+ENV ELABIMG_VERSION=4.3.0
 
 # the target elabftw version is passed with --build-arg
 # it is a mandatory ARG
@@ -137,6 +137,7 @@ RUN mkdir -p /var/log/nginx \
 # php8-bcmath is required to send emails via Exchange (NTLM authenticator)
 # php8-gd is required by mpdf for transparent png
 # php8-tokenizer and php8-xmlwriter are for dev only
+# php8-iconv is required by LdapRecord php library
 # don't put line comments inside this instruction
 RUN apk upgrade -U -a && apk add --no-cache \
     bash \
@@ -156,6 +157,7 @@ RUN apk upgrade -U -a && apk add --no-cache \
     php81-gettext \
     php81-fileinfo \
     php81-fpm \
+    php81-iconv \
     php81-json \
     php81-intl \
     php81-ldap \