Skip to content

Commit

Permalink
fix: re-installing local superset in cache image (#10766)
Browse files Browse the repository at this point in the history
* fix: re-installing local superset in cache image

* Fixing webpack
  • Loading branch information
craig-rueda authored Sep 2, 2020
1 parent 7bccb38 commit 45f4c68
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions Dockerfile-dev
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 45f4c68

Please sign in to comment.