Merge branch 'hypernext'

* hypernext:
  remove deprecated --no-suggest composer option
  bump version and changelog
  add ldap package and strict samesite cookie
  use image instead of image-reference for github action
  try to use the v2 tag for github action

Author: NicolasCARPi

.github/workflows/scan.yml

@@ -10,9 +10,9 @@ jobs:
       - uses: actions/checkout@v1
       - name: Build the Docker image
         run: docker build -t elabftw/elabimg:ci .
-      - uses: anchore/scan-action@master
+      - uses: anchore/scan-action@v2
         with:
-          image-reference: "elabftw/elabimg:ci"
+          image: "elabftw/elabimg:ci"
           fail-build: true
       - name: anchore inline scan JSON results
         run: for j in `ls ./anchore-reports/*.json`; do echo "---- ${j} ----"; cat ${j}; echo; done

CHANGELOG.md

@@ -1,7 +1,13 @@
 # Container image version
 # Note: the version here is from Dockerfile:ELABIMG_VERSION not the tagged one
 
+## 2.1.0
+
+* Add php7-ldap
+* Add Strict SameSite cookie
+
 ## 2.0.1
+
 * Fix supervisord waring on start about user root
 * Fix ELABIMG_VERSION getting added at each restart
 * Fix ln command producing warning on restart

Dockerfile

@@ -5,7 +5,7 @@ FROM alpine:3.11
 ENV ELABFTW_VERSION 3.5.6
 
 # this is versioning for the container image
-ENV ELABIMG_VERSION 2.0.1
+ENV ELABIMG_VERSION 2.1.0
 
 LABEL org.label-schema.name="elabftw" \
     org.label-schema.description="Run nginx and php-fpm to serve elabftw" \
@@ -43,6 +43,7 @@ RUN apk upgrade -U -a && apk add --no-cache \
     php7-fileinfo \
     php7-fpm \
     php7-json \
+    php7-ldap \
     php7-mbstring \
     php7-opcache \
     php7-openssl \
@@ -71,7 +72,7 @@ RUN echo "$(curl -sS https://composer.github.io/installer.sig) -" > composer-set
     && php composer-setup.php && rm composer-setup.php*
 
 # install dependencies
-RUN /elabftw/composer.phar install --prefer-dist --no-progress --no-suggest --no-dev -a && yarn config set network-timeout 300000 && yarn install --pure-lockfile && yarn run buildall && rm -rf node_modules && yarn cache clean && /elabftw/composer.phar clear-cache
+RUN /elabftw/composer.phar install --prefer-dist --no-progress --no-dev -a && yarn config set network-timeout 300000 && yarn install --pure-lockfile && yarn run buildall && rm -rf node_modules && yarn cache clean && /elabftw/composer.phar clear-cache
 
 # redirect nginx logs to stout and stderr
 RUN ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log

src/run.sh

@@ -152,6 +152,7 @@ phpConf() {
     sed -i -e "s/session.cookie_httponly.*/session.cookie_httponly = true/" /etc/php7/php.ini
     sed -i -e "s/;session.cookie_secure.*/session.cookie_secure = true/" /etc/php7/php.ini
     sed -i -e "s/session.use_strict_mode.*/session.use_strict_mode = 1/" /etc/php7/php.ini
+    sed -i -e "s/session.cookie_samesite.*/session.cookie_samesite = \"Strict\"/" /etc/php7/php.ini
     # set redis as session handler if requested
     if ($use_redis); then
         sed -i -e "s:session.save_handler = files:session.save_handler = redis:" /etc/php7/php.ini