Merge pull request #73 from IGNF/valitri

Valitri

Author: cboucheIGN

.docker/Dockerfile

@@ -1,27 +1,28 @@
 #----------------------------------------------------------------------
 # Download vendor from composer.json in dedicated layer
 #----------------------------------------------------------------------
-FROM composer:2.6 as vendor
+ARG registry=docker.io
+FROM ${registry}/library/composer:latest AS vendor
 
 RUN mkdir -p /opt/validator-api
 WORKDIR /opt/validator-api
 COPY composer.json .
 RUN composer install --no-scripts --prefer-dist --ignore-platform-req=ext-pcntl
 
 #----------------------------------------------------------------------
-# Create base layer for dev and production
+# Create application container
 #----------------------------------------------------------------------
-FROM php:8.2-apache as base
+FROM ${registry}/library/ubuntu:24.04
 
 ENV DEBIAN_FRONTEND=noninteractive
-ENV LANG fr_FR.UTF-8
+ENV LANG=fr_FR.UTF-8
 ENV VALIDATOR_PATH=/opt/ign-validator/validator-cli.jar
 
 #----------------------------------------------------------------------
 # Configure locale to fr_FR.UTF-8
 # see also https://stackoverflow.com/a/41797247
 #----------------------------------------------------------------------
-RUN apt-get update && apt-get install -y locales \
+RUN apt-get update && apt-get install --no-install-recommends -y locales \
  && sed -i -e 's/# en_US.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/' /etc/locale.gen \
  && dpkg-reconfigure locales \
  && update-locale LANG=fr_FR.UTF-8 \
@@ -31,26 +32,64 @@ RUN apt-get update && apt-get install -y locales \
 # Install common tools
 #----------------------------------------------------------------------
 RUN apt-get update \
-  && apt-get install -y \
-    unzip \
-    make \
+  && apt-get install --no-install-recommends -y \
+    unzip zip \
     curl wget \
-    zip \
+    file \
+    postgresql-client \
+ && rm -rf /var/lib/apt/lists/*
+
+
+#------------------------------------------------------------------------
+# Configure https://packages.sury.org/php/ to get latests PHP versions
+#------------------------------------------------------------------------
+RUN apt-get update \
+ && apt-get install --no-install-recommends -y gnupg2 software-properties-common \
+ && add-apt-repository -y ppa:ondrej/php \
+ && apt-get remove -y software-properties-common \
  && rm -rf /var/lib/apt/lists/*
 
 #----------------------------------------------------------------------
-# Configure PHP
+# Install Apache, PHP and its extensions
+# TODO : php8.3-pcntl ?
 #----------------------------------------------------------------------
-COPY .docker/php.ini /usr/local/etc/php/conf.d/app.ini
+RUN apt-get update \
+  && apt-get install --no-install-recommends -y \
+      apache2 php8.3 libapache2-mod-php8.3 \
+      php8.3-opcache php8.3-xml \
+      php8.3-pdo php8.3-pgsql php8.3-zip \
+  && rm -rf /var/lib/apt/lists/*
+
+#------------------------------------------------------------------------
+# Add helper script to start apache
+# (see https://github.com/docker-library/php)
+#------------------------------------------------------------------------
+COPY .docker/apache2-foreground /usr/local/bin/apache2-foreground
+RUN chmod +x /usr/local/bin/apache2-foreground
+
+#------------------------------------------------------------------------
+# Create apache2 repository
+# (see https://github.com/docker-library/php)
+#------------------------------------------------------------------------
+RUN mkdir -p /var/run/apache2 && chown -R www-data:www-data /var/run/apache2 \
+ && mkdir -p /var/lock/apache2 && chown -R www-data:www-data /var/lock/apache2 \
+ && mkdir -p /var/log/apache2 && chown -R www-data:www-data /var/log/apache2
+   
+#------------------------------------------------------------------------
+# Redirects logs to stdout / stderr
+# (see https://github.com/docker-library/php)
+#------------------------------------------------------------------------
+RUN ln -sfT /dev/stderr "/var/log/apache2/error.log" \
+ && ln -sfT /dev/stdout "/var/log/apache2/access.log" \
+ && ln -sfT /dev/stdout "/var/log/apache2/other_vhosts_access.log" \
+ && chown www-data:www-data /var/log/apache2/*.log
+
 
 #----------------------------------------------------------------------
-# Install PHP extensions
+# Configure PHP
 #----------------------------------------------------------------------
-RUN apt-get update -qq \
- && apt-get install -y postgresql-client libpq-dev libzip-dev \
- && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
- && docker-php-ext-install opcache pdo pdo_pgsql pgsql zip pcntl \
- && rm -rf /var/lib/apt/lists/*
+COPY .docker/php.ini /etc/php/8.3/apache2/php.ini
+# TODO .docker/php.ini /etc/php/8.3/cli/php.ini
 
 #----------------------------------------------------------------------
 # Configure apache
@@ -61,13 +100,14 @@ COPY .docker/apache-vhost.conf /etc/apache2/sites-available/000-default.conf
 
 RUN a2enmod rewrite remoteip
 
+
 #----------------------------------------------------------------------
 # Setup validator-cli.jar dependencies (java & ogr2ogr)
 #----------------------------------------------------------------------
 RUN apt-get update -qq \
  # see https://github.com/debuerreotype/docker-debian-artifacts/issues/24
  && mkdir -p /usr/share/man/man1 \
- && apt-get install -y openjdk-17-jdk-headless gdal-bin \
+ && apt-get install --no-install-recommends -y openjdk-17-jdk-headless gdal-bin \
  && java -version \
  && ogrinfo --version \
  && rm -rf /var/lib/apt/lists/*
@@ -101,27 +141,8 @@ VOLUME /opt/validator-api/var/data
 
 USER www-data
 
+ENV APP_ENV=prod
+
 EXPOSE 8000
 CMD ["/opt/validator-api/.docker/application.sh"]
 
-#----------------------------------------------------------------------
-# DEV image with xdebug
-#----------------------------------------------------------------------
-FROM base as dev
-
-ENV APP_ENV=dev
-
-USER root
-# install xdebug extension for php
-RUN pear config-set http_proxy ${http_proxy} \
- && pear config-set php_ini $PHP_INI_DIR/php.ini \
- && pecl install xdebug \
- && docker-php-ext-enable xdebug
-USER www-data
-
-#----------------------------------------------------------------------
-# Production image without xdebug
-#----------------------------------------------------------------------
-FROM base as prod
-
-ENV APP_ENV=prod

.docker/apache2-foreground

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -e
+
+# Adapted from docker/php removing folders creation at runtime (requires root)
+# src : https://github.com/docker-library/php/blob/master/8.3/bullseye/apache/apache2-foreground
+
+: "${APACHE_CONFDIR:=/etc/apache2}"
+: "${APACHE_ENVVARS:=$APACHE_CONFDIR/envvars}"
+if test -f "$APACHE_ENVVARS"; then
+	. "$APACHE_ENVVARS"
+fi
+
+# Apache gets grumpy about PID files pre-existing
+: "${APACHE_RUN_DIR:=/var/run/apache2}"
+: "${APACHE_PID_FILE:=$APACHE_RUN_DIR/apache2.pid}"
+rm -f "$APACHE_PID_FILE"
+
+# Start apache forwarding SIGINT and SIGTERM to SIGWINCH
+APACHE2_PID=""
+function stop_apache()
+{
+	if [ ! -z "$APACHE2_PID" ];
+	then
+		kill -s WINCH $APACHE2_PID
+	fi
+}
+
+trap stop_apache SIGINT SIGTERM SIGWINCH
+
+apache2 -DFOREGROUND "$@" &
+APACHE2_PID=$!
+wait $APACHE2_PID

.docker/application.sh

@@ -38,7 +38,7 @@ backend(){
 
 test(){
     export APP_ENV=test
-    export DATABASE_URL="postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@database:5432/validator_api_test?serverVersion=13&charset=utf8"
+    export DATABASE_URL="postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@database:5432/validator_api_test?serverVersion=15&charset=utf8"
     bin/console --env=test doctrine:database:create --if-not-exists
     bin/console --env=test doctrine:schema:update --complete --force
     XDEBUG_MODE=coverage vendor/bin/phpunit

.docker/php.ini

@@ -1,6 +1,9 @@
 ; config/php.ini
 date.timezone = Europe/Paris
 
+# hide php version
+expose_php = off
+
 opcache.enable = 1
 opcache.enable_cli = 1
 opcache.memory_consumption = 128

.env

@@ -44,5 +44,20 @@ CORS_ALLOW_ORIGIN=*
 #
 # DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
 # DATABASE_URL="mysql://db_user:db_password@127.0.0.1:3306/validator-api?serverVersion=5.7"
-DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/validator_api?serverVersion=13&charset=utf8
+DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/validator_api?serverVersion=15&charset=utf8
 ###< doctrine/doctrine-bundle ###
+
+###> league/flysystem
+S3_ENDPOINT=https://s3.sbg.io.cloud.ovh.net
+S3_ACCESS_KEY=
+S3_SECRET_KEY=
+S3_BUCKET=dev-ign-mut-validtri
+S3_REGION=sbg
+
+### validator-worker/validator-cli postgis
+# DB_URL=jdbc:postgresql://${PGHOST}:${PGPORT}/${PGDATABASE}?ssl=true&sslmode=require&sslfactory=org.postgresql.ssl.NonValidatingFactory
+DB_URL=jdbc:postgresql://localhost:5432/validator_api
+DB_USER=${POSTGRES_USER}
+DB_PASSWORD=${POSTGRES_PASSWORD}
+# must stay empty
+DB_SCHEMA=

.github/workflows/php-ci.yml

@@ -14,14 +14,14 @@ jobs:
 
     strategy:
       matrix:
-        php-version: [7.4,8.1]
+        php-version: [8.3]
 
     runs-on: ubuntu-latest
 
     # see https://docs.github.com/en/actions/using-containerized-services/creating-postgresql-service-containers
     services:
       postgres:
-        image: postgres:14
+        image: postgres:15
         env:
           POSTGRES_PASSWORD: postgres
         options: >-
@@ -65,7 +65,7 @@ jobs:
         DATABASE_URL: postgresql://postgres:postgres@localhost:5432/validator_api?serverVersion=14&charset=utf8
 
     - name: Upload coverage results to coveralls.io
-      if: github.ref == 'refs/heads/master' && matrix.php-version == '8.1'
+      if: github.ref == 'refs/heads/master' && matrix.php-version == '8.3'
       run: |
         vendor/bin/php-coveralls --coverage_clover=var/data/output/coverage.xml --json_path=var/data/output/coveralls.json -v
       env:

.gitignore

@@ -31,6 +31,8 @@ sonar-scanner
 node_modules
 
 /output/
+# vscode
+*.bkp
 
 ###> friendsofphp/php-cs-fixer ###
 /.php-cs-fixer.php

composer.json

@@ -32,7 +32,10 @@
     "symfony/validator": "5.4.*",
     "symfony/yaml": "5.4.*",
     "symfony/mime": "5.4.*",
-    "symfony/runtime": "5.4.*"
+    "symfony/runtime": "5.4.*",
+    "league/flysystem-bundle": "^3.3",
+    "league/flysystem-async-aws-s3": "^3.29",
+    "league/flysystem-aws-s3-v3": "^3.29"
   },
   "require-dev": {
     "doctrine/doctrine-fixtures-bundle": "^3.4",

config/bundles.php

@@ -13,4 +13,5 @@
     Liip\TestFixturesBundle\LiipTestFixturesBundle::class => ['dev' => true, 'test' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
     Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
+    League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
 ];

config/packages/doctrine.yaml

@@ -1,7 +1,6 @@
 doctrine:
     dbal:
         url: '%env(resolve:DATABASE_URL)%'
-
         # IMPORTANT: You MUST configure your server version,
         # either here or in the DATABASE_URL env var (see .env file)
         #server_version: '5.7'