New Dockerfile and docker-compose for dev

Author: arikfr

Dockerfile

@@ -1,51 +1,17 @@
-FROM ubuntu:trusty
+FROM redash/base:latest
 
-# Ubuntu packages
-RUN apt-get update && \
-  apt-get install -y python-pip python-dev curl build-essential pwgen libffi-dev sudo git-core wget \
-  # Postgres client
-  libpq-dev \
-  # Additional packages required for data sources:
-  libssl-dev libmysqlclient-dev freetds-dev libsasl2-dev && \
-  apt-get clean && \
-  rm -rf /var/lib/apt/lists/*
+# Webpack dev server
+EXPOSE 8080
 
-# Users creation
-RUN useradd --system --comment " " --create-home redash
+# We first copy only the requirements file, to avoid rebuilding on every file
+# change.
+COPY requirements.txt requirements_dev.txt requirements_all_ds.txt ./
+RUN pip install -r requirements.txt -r requirements_dev.txt -r requirements_all_ds.txt
 
-# Pip requirements for all data source types
-RUN pip install -U setuptools==23.1.0 && \
-  pip install supervisor==3.1.2
+COPY package.json ./
+RUN npm install
 
-COPY . /opt/redash/current
-RUN chown -R redash /opt/redash/current
+COPY . ./
+RUN npm run build
 
-# Setting working directory
-WORKDIR /opt/redash/current
-
-# Install project specific dependencies
-RUN pip install -r requirements_all_ds.txt && \
-  pip install -r requirements.txt
-
-RUN curl https://deb.nodesource.com/setup_4.x | bash - && \
-  apt-get install -y nodejs && \
-  sudo -u redash -H make deps && \
-  rm -rf node_modules client/node_modules /home/redash/.npm /home/redash/.cache && \
-  apt-get purge -y nodejs && \
-  apt-get clean && \
-  rm -rf /var/lib/apt/lists/*
-
-# Setup supervisord
-RUN mkdir -p /opt/redash/supervisord && \
-    mkdir -p /opt/redash/logs && \
-    cp /opt/redash/current/setup/docker/supervisord/supervisord.conf /opt/redash/supervisord/supervisord.conf
-
-# Fix permissions
-RUN chown -R redash /opt/redash
-
-# Expose ports
-EXPOSE 5000
-EXPOSE 9001
-
-# Startup script
-CMD ["supervisord", "-c", "/opt/redash/supervisord/supervisord.conf"]
+ENTRYPOINT ["/app/bin/docker-entrypoint"]

bin/docker-entrypoint

@@ -0,0 +1,61 @@
+#!/bin/bash
+set -e
+
+worker() {
+  WORKERS_COUNT=${WORKERS_COUNT:-2}
+  QUEUES=${QUEUES:-queries,scheduled_queries,celery}
+
+  echo "Starting $WORKERS_COUNT workers for queues: $QUEUES..."
+  exec sudo -E -u redash /usr/local/bin/celery worker --app=redash.worker -c$WORKERS_COUNT -Q$QUEUES -linfo --maxtasksperchild=10 -Ofair
+}
+
+scheduler() {
+  WORKERS_COUNT=${WORKERS_COUNT:-1}
+  QUEUES=${QUEUES:-celery}
+
+  echo "Starting scheduler and $WORKERS_COUNT workers for queues: $QUEUES..."
+
+  exec sudo -E -u redash /usr/local/bin/celery worker --app=redash.worker --beat -c$WORKERS_COUNT -Q$QUEUES -linfo --maxtasksperchild=10 -Ofair
+}
+
+api() {
+  exec sudo -E -u redash /usr/local/bin/gunicorn -b 0.0.0.0:5000 -k gevent --name redash -w5 redash_saas:app
+}
+
+dev_server() {
+  exec sudo -E -u redash /app/manage.py runserver --debugger --reload -h 0.0.0.0
+}
+
+create_db() {
+  exec sudo -E -u redash /app/manage.py database create_tables
+}
+
+help() {
+  echo "Usage: "
+  echo "`basename "$0"` {worker, scheduler, api, shell}"
+}
+
+case "$1" in
+  worker)
+    shift
+    worker
+    ;;
+  api)
+    shift
+    api
+    ;;
+  scheduler)
+    shift
+    scheduler
+    ;;
+  dev_server)
+    shift
+    dev_server
+    ;;
+  shell)
+    exec sudo -E -u redash ./manage.py shell
+    ;;
+  *)
+    help
+    ;;
+esac

docker-compose.dev.yml

@@ -0,0 +1,50 @@
+version: '2'
+services:
+  api:
+    build: .
+    command: dev_server
+    volumes_from:
+      - webpack
+    depends_on:
+      - webpack
+      - postgres
+      - redis
+    ports:
+      - "5002:5000"
+    environment:
+      PYTHONUNBUFFERED: 0
+      REDASH_LOG_LEVEL: "INFO"
+      REDASH_REDIS_URL: "redis://redis:6379/0"
+      REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
+  worker:
+    build: .
+    command: scheduler
+    volumes_from:
+      - webpack
+    depends_on:
+      - postgres
+      - redis
+      - api
+    environment:
+      REDASH_LOG_LEVEL: "INFO"
+      REDASH_REDIS_URL: "redis://redis:6379/0"
+      REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
+      QUEUES: "queries,scheduled_queries,celery"
+      WORKERS_COUNT: 2
+  webpack:
+    build: .
+    command: run start
+    entrypoint: /usr/bin/npm
+    environment:
+      DEV_SERVER_HOST: '0.0.0.0'
+      REDASH_BACKEND: 'http://api:5000'
+    ports:
+      - "8080:8080"
+    volumes:
+      - ".:/app"
+      - "/app/client/dist"
+      - "/app/node_modules"
+  redis:
+    image: redis:2.8
+  postgres:
+    image: postgres:9.3