diff --git a/.docker/main/Dockerfile b/.docker/main/Dockerfile index 422a2c4..0c8fecc 100644 --- a/.docker/main/Dockerfile +++ b/.docker/main/Dockerfile @@ -1,6 +1,5 @@ FROM drupal:11-php8.3-apache -ENV PATH="${PATH}:/opt/drall/vendor/bin" ENV PHP_INI_PATH="$PHP_INI_DIR/conf.d/php.ini" ENV DRUPAL_PATH="/opt/drupal" @@ -19,4 +18,3 @@ COPY . /opt/drall # Provision Drupal. COPY Makefile /opt/drupal/Makefile -RUN make provision/drupal diff --git a/.docker/main/composer.json b/.docker/main/composer.json index 1d14e4b..a3220ca 100644 --- a/.docker/main/composer.json +++ b/.docker/main/composer.json @@ -22,11 +22,11 @@ } ], "require": { - "composer/installers": "^1.9", + "composer/installers": "^2", "drupal/core-composer-scaffold": "*", "drupal/core-recommended": "^11", "drupal/core-vendor-hardening": "*", - "jigarius/drall": "*" + "jigarius/drall": "4.x-dev" }, "conflict": { "drupal/drupal": "*"