include console tools and fix xdebug version set

juliangut · Jun 12, 2023 · ff64cc3 · ff64cc3
1 parent 917d0e4
commit ff64cc3
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 5 deletions.
diff --git a/dist/cli/7.4/Dockerfile b/dist/cli/7.4/Dockerfile
@@ -41,6 +41,7 @@ RUN set -xe \
     shadow \
     sudo \
     bash \
+    ncurses \
     make \
     icu \
     freetype-dev \
@@ -71,7 +72,7 @@ RUN set -xe \
   && pecl update-channels \
   && pecl install \
     apcu \
-    xdebug-$XDEBUG_VERSION \
+    xdebug-3.1.6 \
   \
   && docker-php-ext-enable \
     apcu \

diff --git a/dist/cli/8.0/Dockerfile b/dist/cli/8.0/Dockerfile
@@ -41,6 +41,7 @@ RUN set -xe \
     shadow \
     sudo \
     bash \
+    ncurses \
     make \
     icu \
     freetype-dev \

diff --git a/dist/cli/8.1/Dockerfile b/dist/cli/8.1/Dockerfile
@@ -41,6 +41,7 @@ RUN set -xe \
     shadow \
     sudo \
     bash \
+    ncurses \
     make \
     icu \
     freetype-dev \

diff --git a/dist/cli/8.2/Dockerfile b/dist/cli/8.2/Dockerfile
@@ -41,6 +41,7 @@ RUN set -xe \
     shadow \
     sudo \
     bash \
+    ncurses \
     make \
     icu \
     freetype-dev \

diff --git a/dist/fpm/7.4/Dockerfile b/dist/fpm/7.4/Dockerfile
@@ -41,6 +41,7 @@ RUN set -xe \
     shadow \
     sudo \
     bash \
+    ncurses \
     make \
     icu \
     freetype-dev \
@@ -72,7 +73,7 @@ RUN set -xe \
   && pecl update-channels \
   && pecl install \
     apcu \
-    xdebug-$XDEBUG_VERSION \
+    xdebug-3.1.6 \
   \
   && docker-php-ext-enable \
     apcu \

diff --git a/dist/fpm/8.0/Dockerfile b/dist/fpm/8.0/Dockerfile
@@ -41,6 +41,7 @@ RUN set -xe \
     shadow \
     sudo \
     bash \
+    ncurses \
     make \
     icu \
     freetype-dev \

diff --git a/dist/fpm/8.1/Dockerfile b/dist/fpm/8.1/Dockerfile
@@ -41,6 +41,7 @@ RUN set -xe \
     shadow \
     sudo \
     bash \
+    ncurses \
     make \
     icu \
     freetype-dev \

diff --git a/dist/fpm/8.2/Dockerfile b/dist/fpm/8.2/Dockerfile
@@ -41,6 +41,7 @@ RUN set -xe \
     shadow \
     sudo \
     bash \
+    ncurses \
     make \
     icu \
     freetype-dev \

diff --git a/dist/jenkins/7.4/Dockerfile b/dist/jenkins/7.4/Dockerfile
@@ -41,6 +41,7 @@ RUN set -xe \
     shadow \
     sudo \
     bash \
+    ncurses \
     make \
     icu \
     freetype-dev \
@@ -78,7 +79,7 @@ RUN set -xe \
   && pecl update-channels \
   && pecl install \
     apcu \
-    xdebug-$XDEBUG_VERSION \
+    xdebug-3.1.6 \
   \
   && docker-php-ext-enable \
     apcu \

diff --git a/dist/jenkins/8.0/Dockerfile b/dist/jenkins/8.0/Dockerfile
@@ -41,6 +41,7 @@ RUN set -xe \
     shadow \
     sudo \
     bash \
+    ncurses \
     make \
     icu \
     freetype-dev \

diff --git a/dist/jenkins/8.1/Dockerfile b/dist/jenkins/8.1/Dockerfile
@@ -41,6 +41,7 @@ RUN set -xe \
     shadow \
     sudo \
     bash \
+    ncurses \
     make \
     icu \
     freetype-dev \

diff --git a/dist/jenkins/8.2/Dockerfile b/dist/jenkins/8.2/Dockerfile
@@ -41,6 +41,7 @@ RUN set -xe \
     shadow \
     sudo \
     bash \
+    ncurses \
     make \
     icu \
     freetype-dev \

diff --git a/src/Command/ScaffoldCommand.php b/src/Command/ScaffoldCommand.php
@@ -89,7 +89,7 @@ public function __construct(
 
         $this->defaultContext = [
             'comment' => $noteComment,
-            'xdebug' => true,
+            'xdebug' => 'latest',
             'image' => '',
             'tags' => [],
             'variant' => '',

diff --git a/templates/Dockerfile.twig b/templates/Dockerfile.twig
@@ -36,6 +36,7 @@ RUN set -xe \
     shadow \
     sudo \
     bash \
+    ncurses \
     make \
     icu \
     freetype-dev \
@@ -68,8 +69,10 @@ RUN set -xe \
   && pecl update-channels \
   && pecl install \
     apcu \
-{% if xdebug != false %}
+{% if xdebug == 'latest' %}
     xdebug-$XDEBUG_VERSION \
+{% elseif xdebug != false %}
+    xdebug-{{ xdebug }} \
 {% endif %}
   \
   && docker-php-ext-enable \