You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by cr...@apache.org on 2020/05/19 15:47:52 UTC
[incubator-superset] branch master updated: fix: issue with
duplicated dependencies (#9837)
This is an automated email from the ASF dual-hosted git repository.
craigrueda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 88dd2dd fix: issue with duplicated dependencies (#9837)
88dd2dd is described below
commit 88dd2ddd5666c2883187b9ba10c85a781aa88edf
Author: Craig Rueda <cr...@craigrueda.com>
AuthorDate: Tue May 19 08:46:52 2020 -0700
fix: issue with duplicated dependencies (#9837)
* Fixing issue with duplicated dependencies in various requirements files.
* Removing restart stanza for tests_worker
* Adding Superset dev Dockerfile
---
Dockerfile | 10 +++++++---
Dockerfile-dev | 31 +++++++++++++++++++++++++++++++
docker-compose.yml | 4 +---
3 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index a10fcfe..578f984 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -114,10 +114,14 @@ ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
######################################################################
FROM lean AS dev
-COPY ./requirements-dev.txt ./docker/requirements* /app/
+COPY ./requirements* ./docker/requirements* /app/
USER root
+# Cache everything for dev purposes...
RUN cd /app \
- && pip install --no-cache -r requirements-dev.txt -r requirements-extra.txt \
- && pip install --no-cache -r requirements-local.txt || true
+ && pip install --ignore-installed -e . \
+ && pip install --ignore-installed -r requirements.txt \
+ && pip install --ignore-installed -r requirements-dev.txt \
+ && pip install --ignore-installed -r requirements-extra.txt \
+ && pip install --ignore-installed -r requirements-local.txt || true
USER superset
diff --git a/Dockerfile-dev b/Dockerfile-dev
new file mode 100644
index 0000000..f54f033
--- /dev/null
+++ b/Dockerfile-dev
@@ -0,0 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+######################################################################
+# Dev image...
+######################################################################
+FROM preset/superset:dev
+
+COPY ./requirements* ./docker/requirements* /app/
+
+USER root
+RUN cd /app \
+ && pip install -e . \
+ && pip install --no-cache -r requirements.txt -r requirements-dev.txt \
+ && pip install --no-cache -r requirements-extra.txt \
+ && pip install --no-cache -r requirements-local.txt || true
+USER superset
diff --git a/docker-compose.yml b/docker-compose.yml
index 350bb57..4d63213 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,8 +18,7 @@ x-superset-build: &superset-build
args:
NPM_BUILD_CMD: build-dev
context: ./
- dockerfile: Dockerfile
- target: dev
+ dockerfile: Dockerfile-dev
x-superset-depends-on: &superset-depends-on
- db
- redis
@@ -101,7 +100,6 @@ services:
REDIS_RESULTS_DB: 3
REDIS_HOST: localhost
network_mode: host
- restart: unless-stopped
depends_on: *superset-depends-on
volumes: *superset-volumes