diff --git a/.env.example b/.env.example index 9b381cbb..d3a4c32e 100644 --- a/.env.example +++ b/.env.example @@ -202,7 +202,6 @@ WORKSPACE_INSTALL_WKHTMLTOPDF=false WORKSPACE_WKHTMLTOPDF_VERSION=0.12.6-1 WORKSPACE_INSTALL_GNU_PARALLEL=false WORKSPACE_INSTALL_AST=true -WORKSPACE_AST_VERSION=1.0.10 WORKSPACE_BROWSERSYNC_HOST_PORT=3000 WORKSPACE_BROWSERSYNC_UI_HOST_PORT=3001 WORKSPACE_VUE_CLI_SERVE_HOST_PORT=8080 diff --git a/docker-compose.yml b/docker-compose.yml index 5c11ce80..1d1bda08 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -155,7 +155,6 @@ services: - NODE_VERSION=${WORKSPACE_NODE_VERSION} - YARN_VERSION=${WORKSPACE_YARN_VERSION} - DRUSH_VERSION=${WORKSPACE_DRUSH_VERSION} - - AST_VERSION=${WORKSPACE_AST_VERSION} - IMAGEMAGICK_VERSION=${WORKSPACE_IMAGEMAGICK_VERSION} - TZ=${WORKSPACE_TIMEZONE} - BLACKFIRE_CLIENT_ID=${BLACKFIRE_CLIENT_ID} diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 48819053..15bb1909 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -675,18 +675,16 @@ RUN if [ ${INSTALL_INOTIFY} = true ]; then \ ########################################################################### ARG INSTALL_AST=false -ARG AST_VERSION=1.0.10 -ENV AST_VERSION ${AST_VERSION} RUN if [ ${INSTALL_AST} = true ]; then \ - # AST extension requires PHP 7.0.0 or newer - if [ $(php -r "echo PHP_MAJOR_VERSION;") != "5" ]; then \ - # Install AST extension - printf "\n" | pecl -q install ast-${AST_VERSION} && \ - echo "extension=ast.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/ast.ini && \ - phpenmod -v ${LARADOCK_PHP_VERSION} -s cli ast \ - ;fi \ -;fi + if [ "$(php -r 'echo PHP_VERSION_ID;')" -le 70100 ]; then \ + printf "\n" | pecl -q install ast-1.0.16; \ + else \ + printf "\n" | pecl -q install ast; \ + fi; \ + echo "extension=ast.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/ast.ini; \ + phpenmod -v ${LARADOCK_PHP_VERSION} -s cli ast; \ +fi ########################################################################### # fswatch