From 7724eaee8d03dad6f1ff1a214a8d16502b263f54 Mon Sep 17 00:00:00 2001 From: Craig Date: Wed, 2 Sep 2020 08:37:31 -0700 Subject: [PATCH 1/2] fix: re-installing local superset in cache image --- Dockerfile-dev | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile-dev b/Dockerfile-dev index a07221044fc67..8051be45a1556 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -21,10 +21,12 @@ FROM preset/superset:dev COPY ./requirements/*.txt ./docker/requirements-*.txt /app/requirements/ +COPY ./setup.py ./MANIFEST.in /app/ USER root # Cache everything for dev purposes... RUN cd /app \ - && pip install --no-cache -r requirements/docker.txt \ - && pip install --no-cache -r requirements/requirements-local.txt || true + && pip install -e . \ + && pip install -r requirements/docker.txt \ + && pip install -r requirements/requirements-local.txt || true USER superset From c847d6d224ae3a82e0a8ba5e4b48daae36efd770 Mon Sep 17 00:00:00 2001 From: Craig Date: Wed, 2 Sep 2020 11:16:36 -0700 Subject: [PATCH 2/2] Fixing webpack --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ed8c2db9bb153..b01789ce066bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -71,9 +71,9 @@ services: volumes: *superset-volumes superset-node: - image: node:10-jessie + image: node:12 container_name: superset_node - command: ["bash", "-c", "cd /app/superset-frontend && npm install --global webpack webpack-cli && npm install && npm run dev"] + command: ["bash", "-c", "cd /app/superset-frontend && npm install -f --no-optional --global webpack webpack-cli && npm install -f --no-optional && npm run dev"] env_file: docker/.env depends_on: *superset-depends-on volumes: *superset-volumes