From c6d04b3004209f99b820ddcb37bdab09e8947662 Mon Sep 17 00:00:00 2001 From: John Cyrill Corsanes Date: Wed, 2 Mar 2022 20:21:41 +0800 Subject: [PATCH] Segregate xdebug installation && package.json cleanup --- .devcontainer/Dockerfile | 6 +++--- package.json | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 4972c94..c9e1fd7 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -58,9 +58,9 @@ ARG XDEBUG_REMOTE_HOST=localhost ARG XDEBUG_REMOTE_PORT=9001 ARG XDEBUG_REMOTE_LOG -# Install xdebug -RUN pecl install xdebug \ - && docker-php-ext-enable xdebug +# Install xdebug +RUN pecl install xdebug || true +RUN docker-php-ext-enable xdebug RUN echo "error_reporting = E_ALL" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ && echo "display_startup_errors = On" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ diff --git a/package.json b/package.json index cdc724d..f20bff8 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "license": "MIT", "private": true, "scripts": { + "build": "yarn run build:js && yarn run build:css", "build:js": "webpack --progress --mode=production", "watch:js": "webpack --progress --watch --mode=development", "build:css": "node-sass --omit-source-map-url --importer node_modules/node-sass-import assets/_css/index.scss assets/css/index.css", @@ -27,4 +28,4 @@ "node-sass-import": "^2.0.1", "webpack-cli": "^4.9.2" } -} +} \ No newline at end of file