diff --git a/.editorconfig b/.editorconfig index 0eda619e8..b6ffb5b1c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,4 @@ -root = true +root = false [*] indent_size = 4 @@ -11,3 +11,17 @@ insert_final_newline = true [{*.yml,*.yaml}] indent_style = space indent_size = 2 + +[*.sh] +indent_style = space +indent_size = 4 + +shell_variant = bash +binary_next_line = true +case-indent = true +switch_case_indent = true +space_redirects = true +keep_padding = true +function_next_line = true +simplify = true +space-redirects = true diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index 0a15bc6b5..7715dc7b3 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -11,7 +11,7 @@ ARG FOREGO_VERSION=0.17.2 ARG PECL_EXTENSIONS_EXTRA="" ARG PECL_EXTENSIONS="imagick redis" ARG PHP_BASE_TYPE="apache" -ARG PHP_DATABASE_EXTENSIONS="pdo_pgsql pdo_mysql" +ARG PHP_DATABASE_EXTENSIONS="pdo_pgsql pdo_mysql pdo_sqlite" ARG PHP_DEBIAN_RELEASE="bullseye" ARG PHP_EXTENSIONS_EXTRA="" ARG PHP_EXTENSIONS="intl bcmath zip pcntl exif curl gd"