From 3e6b2450f8ac9c3423d85237254122c1ed8dfb63 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Tue, 30 Jul 2024 09:46:05 -0700 Subject: [PATCH 1/3] fix: remove --no-optional from docker-compose build --- docker/docker-frontend.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/docker-frontend.sh b/docker/docker-frontend.sh index aad6e0a16d5b..e79702217926 100755 --- a/docker/docker-frontend.sh +++ b/docker/docker-frontend.sh @@ -25,8 +25,7 @@ fi if [ "$BUILD_SUPERSET_FRONTEND_IN_DOCKER" = "true" ]; then cd /app/superset-frontend - npm install -f --no-optional --global webpack webpack-cli - npm install -f + npm install echo "Running frontend" npm run dev From eeb26c530fbaafeb8b31e87c593b163eeb559f1a Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Tue, 30 Jul 2024 10:30:40 -0700 Subject: [PATCH 2/3] minor tweaks --- docker-compose.yml | 1 + docker/docker-frontend.sh | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index de0f12db2e7c..aa8d940a8cde 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -151,6 +151,7 @@ services: environment: # set this to false if you have perf issues running the npm i; npm run dev in-docker # if you do so, you have to run this manually on the host, which should perform better! + BUILD_SUPERSET_FRONTEND_IN_DOCKER: true SCARF_ANALYTICS: "${SCARF_ANALYTICS:-}" container_name: superset_node command: ["/app/docker/docker-frontend.sh"] diff --git a/docker/docker-frontend.sh b/docker/docker-frontend.sh index e79702217926..4143c53afdd7 100755 --- a/docker/docker-frontend.sh +++ b/docker/docker-frontend.sh @@ -24,11 +24,15 @@ if [ "$PUPPETEER_SKIP_CHROMIUM_DOWNLOAD" = "false" ]; then fi if [ "$BUILD_SUPERSET_FRONTEND_IN_DOCKER" = "true" ]; then + echo "Building Superset frontend in dev mode inside docker container" cd /app/superset-frontend + + echo "Running `npm install`" npm install echo "Running frontend" npm run dev + else - echo "Skipping frontend build steps - YOU RUN IT MANUALLY ON THE HOST!" + echo "Skipping frontend build steps - YOU NEED TO RUN IT MANUALLY ON THE HOST!" fi From 64b8ef6fc546f65c638383c06821696da516b810 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Tue, 30 Jul 2024 11:28:53 -0700 Subject: [PATCH 3/3] evan's suggestion --- docker/docker-frontend.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/docker-frontend.sh b/docker/docker-frontend.sh index 4143c53afdd7..bb46c07f988f 100755 --- a/docker/docker-frontend.sh +++ b/docker/docker-frontend.sh @@ -35,4 +35,5 @@ if [ "$BUILD_SUPERSET_FRONTEND_IN_DOCKER" = "true" ]; then else echo "Skipping frontend build steps - YOU NEED TO RUN IT MANUALLY ON THE HOST!" + echo "https://superset.apache.org/docs/contributing/development/#webpack-dev-server" fi