From 5700f8d3633a8e572c5d79c872d8e2e4848fdf2c Mon Sep 17 00:00:00 2001
From: Craig Rueda <craig@craigrueda.com>
Date: Mon, 16 Nov 2020 07:54:44 -0800
Subject: [PATCH] Switching Docker compose over to the official image (#11707)

---
 Dockerfile-dev     | 32 --------------------------------
 docker-compose.yml | 14 +++++---------
 2 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 Dockerfile-dev

diff --git a/Dockerfile-dev b/Dockerfile-dev
deleted file mode 100644
index ea2d1ecc1c..0000000000
--- a/Dockerfile-dev
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# 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 apache/incubator-superset:master-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 -e . \
-    && pip install -r requirements/docker.txt \
-    && pip install -r requirements/requirements-local.txt || true
-USER superset
diff --git a/docker-compose.yml b/docker-compose.yml
index b01789ce06..0bdcdeb615 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,11 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-x-superset-build: &superset-build
-  args:
-    NPM_BUILD_CMD: build-dev
-  context: ./
-  dockerfile: Dockerfile-dev
+x-superset-image: &superset-image apache/incubator-superset:latest-dev
 x-superset-depends-on: &superset-depends-on
   - db
   - redis
@@ -53,7 +49,7 @@ services:
 
   superset:
     env_file: docker/.env
-    build: *superset-build
+    image: *superset-image
     container_name: superset_app
     command: ["flask", "run", "-p", "8088", "--with-threads", "--reload", "--debugger", "--host=0.0.0.0"]
     restart: unless-stopped
@@ -63,7 +59,7 @@ services:
     volumes: *superset-volumes
 
   superset-init:
-    build: *superset-build
+    image: *superset-image
     container_name: superset_init
     command: ["/app/docker-init.sh"]
     env_file: docker/.env
@@ -79,7 +75,7 @@ services:
     volumes: *superset-volumes
 
   superset-worker:
-    build: *superset-build
+    image: *superset-image
     container_name: superset_worker
     command: ["celery", "worker", "--app=superset.tasks.celery_app:app", "-Ofair", "-l", "INFO"]
     env_file: docker/.env
@@ -88,7 +84,7 @@ services:
     volumes: *superset-volumes
 
   superset-tests-worker:
-    build: *superset-build
+    image: *superset-image
     container_name: superset_tests_worker
     command: ["celery", "worker", "--app=superset.tasks.celery_app:app", "-Ofair", "-l", "INFO"]
     env_file: docker/.env