feat: Added ffmpeg to docker image and populate DotEnv var

roadiz · Sep 6, 2022 · 601b137 · 601b137
1 parent 0a9ea18
commit 601b137
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 4 deletions.
diff --git a/.env b/.env
@@ -2,6 +2,7 @@ APP_DEBUG=1
 APP_CACHE=0
 APP_NAMESPACE=dev
 APP_VERSION=0.1.0
+APP_FFMPEG_PATH=/usr/bin/ffmpeg
 APP_UNSPLASH_CLIENT_ID=
 APP_HEALTH_CHECK_TOKEN=
 APP_TIMEZONE=Europe/Paris

diff --git a/composer.json b/composer.json
@@ -18,12 +18,13 @@
         "doctrine/orm": "^2.12.2",
         "gedmo/doctrine-extensions": "^2.4 || ^3.0.0",
         "inlinestyle/inlinestyle": "~1.2.7",
+        "james-heinrich/getid3": "^1.9",
         "jms/serializer": "^3.1.1",
         "jms/serializer-bundle": "^3.10.0",
         "lexik/jwt-authentication-bundle": "^2.13",
-        "rezozero/liform-bundle": "^0.18.0",
         "nelmio/cors-bundle": "^2.2",
         "phpdocumentor/reflection-docblock": "^5.2",
+        "rezozero/liform-bundle": "^0.18.1",
         "roadiz/compat-bundle": "~2.0.0 || dev-develop",
         "roadiz/core-bundle": "~2.0.0 || dev-develop",
         "roadiz/rozier-bundle": "~2.0.0 || dev-develop",

diff --git a/config/packages/dev/monolog.yaml b/config/packages/dev/monolog.yaml
@@ -11,6 +11,11 @@ monolog:
             path: "%kernel.logs_dir%/solr.%kernel.environment%.log"
             level: debug
             channels: [ "searchEngine" ]
+        messenger:
+            type: stream
+            path: "%kernel.logs_dir%/messenger.%kernel.environment%.log"
+            level: debug
+            channels: ["messenger"]
         # uncomment to get logging in your browser
         # you may have to allow bigger header sizes in your Web server configuration
         #firephp:

diff --git a/config/packages/messenger.yaml b/config/packages/messenger.yaml
@@ -4,7 +4,6 @@ framework:
         # failure_transport: failed
         reset_on_message: true
         transports:
-            # https://symfony.com/doc/current/messenger.html#transport-configuration
             async: '%env(MESSENGER_TRANSPORT_DSN)%'
             failed: 'doctrine://default?queue_name=failed'
             sync: 'sync://'

diff --git a/config/packages/monolog.yaml b/config/packages/monolog.yaml
@@ -18,6 +18,11 @@ when@dev:
             #chromephp:
             #    type: chromephp
             #    level: info
+            messenger:
+                type: stream
+                path: "%kernel.logs_dir%/messenger.%kernel.environment%.log"
+                level: debug
+                channels: ["messenger"]
             console:
                 type: console
                 process_psr_3_messages: false

diff --git a/config/packages/roadiz_core.yaml b/config/packages/roadiz_core.yaml
@@ -8,6 +8,7 @@ roadiz_core:
         private_key_name: default
     medias:
         unsplash_client_id: '%env(string:APP_UNSPLASH_CLIENT_ID)%'
+        ffmpeg_path: '%env(string:APP_FFMPEG_PATH)%'
     inheritance:
         type: single_table
 #    reverseProxyCache:

diff --git a/docker/php80-nginx-alpine/Dockerfile b/docker/php80-nginx-alpine/Dockerfile
@@ -5,8 +5,9 @@ ARG USER_UID=1000
 ENV COMPOSER_ALLOW_SUPERUSER=1
 ENV APP_ENV=dev
 ENV APP_CACHE=0
+ENV APP_FFMPEG_PATH=/usr/bin/ffmpeg
 
-RUN apk add --no-cache shadow make git \
+RUN apk add --no-cache shadow make git ffmpeg \
     && usermod -u ${USER_UID} www-data \
     && groupmod -g ${USER_UID} www-data \
     && composer --version \

diff --git a/docker/php81-nginx-alpine/Dockerfile b/docker/php81-nginx-alpine/Dockerfile
@@ -5,8 +5,9 @@ ARG USER_UID=1000
 ENV COMPOSER_ALLOW_SUPERUSER=1
 ENV APP_ENV=dev
 ENV APP_CACHE=0
+ENV APP_FFMPEG_PATH=/usr/bin/ffmpeg
 
-RUN apk add --no-cache shadow make git \
+RUN apk add --no-cache shadow make git ffmpeg \
     && usermod -u ${USER_UID} www-data \
     && groupmod -g ${USER_UID} www-data \
     && composer --version \