[CI] Update docker prod image

.dockerignore

@@ -1,25 +1,51 @@
-*.md
-.git
-.gitignore
+**/*.log
+**/*.md
+**/*.php~
+**/*.dist.php
+**/*.dist
+**/*.cache
+**/._*
+**/.dockerignore
+**/.DS_Store
+**/.git/
+**/.gitattributes
+**/.gitignore
+**/.gitmodules
+**/docker-compose.*.yaml
+**/docker-compose.*.yml
+**/docker-compose.yaml
+**/docker-compose.yml
+**/Dockerfile
+**/Thumbs.db
+.github/
+docs/
+public/bundles/
+tests/
+var/
+vendor/
+.editorconfig
+.env.*.local
+.env.dev
+.env.local
+.env.local.php
+.env.test
 .idea
 .tmp
+app/
 docker-dev.md5
 .php_cs.*
-docker-compose.*
-supervisord.*
-behat.yml.dist
 features
 Makefile
 dump
 docs
 node_modules
 package.json
-phpunit.xml.dist
-tests
-var
-vendor
-scripts
 webpack.*.js
 yarn.lock
 src/DataFixtures
 gcloud-service-key.json
+assets
+front
+docker-dev.lock
+tailwind.config*.js
+postcss.config.js

.gitignore

@@ -19,8 +19,6 @@
 /npm-debug.log
 /phpunit.xml
 /.phpunit.result.cache
-/supervisord.log
-/supervisord.pid
 /yarn-error.log
 /.php_cs
 /.docker-dev.md5

Dockerfile

@@ -9,7 +9,7 @@ FROM node:${NODE_VERSION}-alpine AS node
 RUN apk add --no-cache git
 WORKDIR /srv/app
 
-FROM caddy:${CADDY_VERSION} AS caddy
+FROM caddy:${CADDY_VERSION}-alpine AS caddy
 
 FROM mlocati/php-extension-installer:2 AS php_extension_installer
 
@@ -21,7 +21,7 @@ ENV APP_ENV=prod
 WORKDIR /srv/app
 
 # php extensions installer: https://github.com/mlocati/docker-php-extension-installer
-COPY --from=php_extension_installer --link /usr/bin/install-php-extensions /usr/local/bin/
+COPY --link --from=php_extension_installer /usr/bin/install-php-extensions /usr/local/bin/
 
 # persistent / runtime deps
 RUN apk add --no-cache \
@@ -58,7 +58,7 @@ RUN mkdir -p /var/run/php
 COPY --link docker/php/docker-healthcheck.sh /usr/local/bin/docker-healthcheck
 RUN chmod +x /usr/local/bin/docker-healthcheck
 
-HEALTHCHECK --interval=10s --timeout=3s --retries=3 CMD ["docker-healthcheck"]
+HEALTHCHECK --interval=30s --timeout=3s --retries=3 CMD ["docker-healthcheck"]
 
 COPY --link docker/php/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 RUN chmod +x /usr/local/bin/docker-entrypoint
@@ -67,7 +67,7 @@ RUN chmod +x /usr/local/bin/docker-entrypoint
 ENV COMPOSER_ALLOW_SUPERUSER=1
 ENV PATH="${PATH}:/root/.composer/vendor/bin"
 
-COPY --from=composer/composer:2-bin --link /composer /usr/bin/composer
+COPY --link --from=composer/composer:2-bin /composer /usr/bin/composer
 
 COPY --link . .
 
@@ -78,11 +78,12 @@ RUN test -z "$BUILD_DEV" && ( \
         composer dump-autoload --classmap-authoritative --no-dev; \
         composer dump-env prod; \
         composer run-script --no-dev post-install-cmd; \
+        rm -rf /root/.composer; \
         chmod +x bin/console; sync \
     ) || :
 
-COPY --from=caddy /usr/bin/caddy /usr/bin/caddy
-COPY docker/caddy/Caddyfile /etc/caddy/Caddyfile
+COPY --link --from=caddy /usr/bin/caddy /usr/bin/caddy
+COPY --link docker/caddy/Caddyfile /etc/caddy/Caddyfile
 
 EXPOSE 80
 

docker/caddy/Caddyfile

@@ -4,13 +4,15 @@
 	auto_https off
 }
 
-:80
+:80 
 
 {$CADDY_EXTRA_CONFIG}
 
 log
 
 route {
+	respond /healthcheck 200
+
 	root * /srv/app/public
 	php_fastcgi unix//var/run/php/php-fpm.sock
 	encode zstd gzip

docker/php/docker-entrypoint.sh

@@ -7,6 +7,12 @@ if [ "${1#-}" != "$1" ]; then
 fi
 
 if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
+  if [ "$APP_ENV" = 'prod' ]; then
+    rm -rf var/cache/*
+    bin/console cache:clear --env=prod --no-warmup
+    bin/console cache:warmup --env=prod
+  fi
+
   setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX var
   setfacl -dR -m u:www-data:rwX -m u:"$(whoami)":rwX var
 fi

src/Entity/AdherentMandate/AbstractAdherentMandate.php

@@ -99,7 +99,7 @@ abstract class AbstractAdherentMandate implements AdherentMandateInterface
      */
     public $provisional = false;
 
-    final public function __construct(
+    public function __construct(
         Adherent $adherent,
         ?string $gender,
         \DateTime $beginAt,

src/Entity/AdherentMessage/AbstractAdherentMessage.php

@@ -123,6 +123,8 @@
  * @ApiFilter(OrderFilter::class, properties={"createdAt"})
  *
  * @ValidAuthorRoleMessageType
+ *
+ * @phpstan-consistent-constructor
  */
 abstract class AbstractAdherentMessage implements AdherentMessageInterface
 {
@@ -240,7 +242,7 @@ abstract class AbstractAdherentMessage implements AdherentMessageInterface
      */
     private $source = self::SOURCE_PLATFORM;
 
-    final public function __construct(UuidInterface $uuid = null, Adherent $author = null)
+    public function __construct(UuidInterface $uuid = null, Adherent $author = null)
     {
         $this->uuid = $uuid ?? Uuid::uuid4();
         $this->author = $author;

src/Entity/AdherentToken.php

@@ -14,6 +14,8 @@
  * An abstract temporary token for Adherent.
  *
  * @ORM\MappedSuperclass
+ *
+ * @phpstan-consistent-constructor
  */
 abstract class AdherentToken implements AdherentExpirableTokenInterface
 {
@@ -52,12 +54,8 @@ abstract class AdherentToken implements AdherentExpirableTokenInterface
      */
     private $usedAt;
 
-    final private function __construct(
-        UuidInterface $adherentUuid,
-        \DateTime $createdAt,
-        \DateTime $expiration,
-        SHA1 $value
-    ) {
+    public function __construct(UuidInterface $adherentUuid, \DateTime $createdAt, \DateTime $expiration, SHA1 $value)
+    {
         if ($expiration <= new \DateTime('now')) {
             throw new \InvalidArgumentException('Expiration date must be in the future.');
         }
@@ -69,10 +67,7 @@ final private function __construct(
         $this->expiredAt = $expiration;
     }
 
-    /**
-     * @return static
-     */
-    public static function generate(Adherent $adherent, string $lifetime = '+1 day'): AdherentExpirableTokenInterface
+    public static function generate(Adherent $adherent, string $lifetime = '+1 day'): static
     {
         $timestamp = new \DateTime('now');
         $adherentUuid = clone $adherent->getUuid();

src/Entity/Report/Report.php

@@ -70,7 +70,7 @@ abstract class Report
     /**
      * @throws \InvalidArgumentException
      */
-    final public function __construct(ReportableInterface $subject, Adherent $author, array $reasons, ?string $comment)
+    public function __construct(ReportableInterface $subject, Adherent $author, array $reasons, ?string $comment)
     {
         if (!\count($reasons)) {
             throw new \InvalidArgumentException('At least one reason must be provided');