Drop drupal console launcher, add optional installation of global dru…

…sh for D7
wodby · Oct 14, 2024 · 3677320 · 3677320
1 parent e48f63b
commit 3677320
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,12 +9,6 @@ ENV PHP_REALPATH_CACHE_TTL="3600" \
 USER root
 
 RUN set -ex; \
-    \
-    # Drupal console
-    console_url="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.7/drupal.phar"; \
-    curl "${console_url}" -L -o drupal.phar; \
-    mv drupal.phar /usr/local/bin/drupal; \
-    chmod +x /usr/local/bin/drupal; \
     \
     mv /usr/local/bin/actions.mk /usr/local/bin/php.mk; \
     # Change overridden target name to avoid warnings.

diff --git a/README.md b/README.md
@@ -31,20 +31,16 @@ See [wodby/php](https://github.com/wodby/php) for the exact PHP version
 
 All images built for `linux/amd64` and `linux/arm64`
 
-## Tools
-
-| Tool                      | 8.2    | 8.1    |
-|---------------------------|--------|--------|
-| [Drupal Console Launcher] | 1.9.7  | 1.9.7  |
-
 ## Environment Variables
 
-| Variable                         | Default Value | Description                                                     |
-|----------------------------------|---------------|-----------------------------------------------------------------|
-| `DRUPAL_REVERSE_PROXY_ADDRESSES` |               |                                                                 |
-| `DRUPAL_PHP_STORAGE_DIR`         |               | Sets the default storage dir for generated PHP code (i.e. Twig) |
-| `PHP_OUTPUT_BUFFERING`           | `16384`       |                                                                 |
-| `PHP_REALPATH_CACHE_TTL`         | `3600`        |                                                                 |
+| Variable                         | Default Value | Description                                                                     |
+|----------------------------------|---------------|---------------------------------------------------------------------------------|
+| `DRUPAL_REVERSE_PROXY_ADDRESSES` |               |                                                                                 |
+| `DRUPAL_PHP_STORAGE_DIR`         |               | Sets the default storage dir for generated PHP code (i.e. Twig)                 |
+| `PHP_OUTPUT_BUFFERING`           | `16384`       |                                                                                 |
+| `PHP_REALPATH_CACHE_TTL`         | `3600`        |                                                                                 |
+| `DRUPAL_VERSION`                 |               |                                                                                 |
+| `DRUPAL7_INSTALL_GLOBAL_DRUSH`   |               | Installs global drush 7.* during entrypoint, works only with `DRUPAL_VERSION=7` |
 
 See [wodby/php](https://github.com/wodby/php) for all variables
 

diff --git a/init/20_drupal7_drush.sh b/init/20_drupal7_drush.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -e
+
+if [[ -n "${DEBUG}" ]]; then
+    set -x
+fi
+
+if [[ -n "${DRUPAL_VERSION}" && "${DRUPAL_VERSION}" == "7" && -n "${DRUPAL7_INSTALL_GLOBAL_DRUSH}" ]]; then
+    composer global require "drush/drush:7.*"
+fi