reform frontend out of Docker stuff + other Docker

+ other Docker things

to get all images on cli:
docker build -t t:latest-celery-fast . --target=celery-fast
docker build -t t:latest-celery-slow . --target=celery-slow
docker build -t t:latest . --target=api
docker build -t t:latest-gpu -f gpu.Dockerfile .
(compose: see docker-compose files)

.dockerignore

@@ -2,7 +2,6 @@
 .git
 *Dockerfile*
 *docker-compose*
-web-entrypoint.sh
 
 docs
 env
@@ -11,5 +10,4 @@ screenshots
 
 frontend/assets/
 frontend/node_modules
-frontend/src
 frontend/webpack-stats.json

Dockerfile

@@ -1,19 +1,41 @@
-FROM python:3.7-buster
+FROM python:3.7-buster AS celery-fast
 
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
-RUN mkdir -p /webapp/media /webapp/staticfiles
 WORKDIR /webapp
+RUN mkdir -p /webapp/{media,staticfiles}
 
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ffmpeg libasound2-dev libsndfile-dev \
+    && rm -rf /var/lib/apt/lists/*
 COPY requirements.txt /webapp/
-
-# Install all dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends ffmpeg libasound2-dev libsndfile-dev && pip install --upgrade pip -r requirements.txt
+RUN pip install -r requirements.txt
 
 COPY . .
 
-# Copy over entrypoint script
-COPY api-entrypoint.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/api-entrypoint.sh && ln -s /usr/local/bin/api-entrypoint.sh /
-ENTRYPOINT ["api-entrypoint.sh"]
+
+COPY celery-fast-entrypoint.sh .
+ENTRYPOINT ["./celery-fast-entrypoint.sh"]
+
+FROM celery-fast AS celery-slow
+COPY celery-slow-entrypoint.sh .
+ENTRYPOINT ["./celery-slow-entrypoint.sh"]
+
+
+FROM node:14-buster AS frontend
+WORKDIR /webapp/frontend
+RUN mkdir -p /webapp/frontend/assets
+
+COPY frontend/package.json .
+COPY frontend/package-lock.json .
+RUN npm install
+
+COPY frontend/ .
+RUN ./entrypoint.sh
+
+
+FROM celery-fast AS api
+COPY --from=frontend /webapp/frontend/assets /webapp/frontend/assets
+COPY api-entrypoint.sh .
+ENTRYPOINT ["./api-entrypoint.sh"]

api-entrypoint.sh

@@ -2,11 +2,6 @@
 
 # Collect static files
 if [[ -z "${DJANGO_DEVELOPMENT}" ]]; then
-    echo "Waiting for asset creation"
-    while [ ! -d /webapp/frontend/assets/dist ]; do
-        sleep 1
-    done
-    echo "Collect static files"
     python3.7 manage.py collectstatic --noinput
 fi
 

docker-compose.build.gpu.yml

@@ -3,16 +3,11 @@ services:
   nginx:
     build: ./nginx
   api:
-    build:
-      context: .
-      dockerfile: gpu.Dockerfile
+    build: .
   celery-fast:
     build:
-      context: .
-      dockerfile: gpu.Dockerfile
+      target: celery-fast
   celery-slow:
     build:
       context: .
       dockerfile: gpu.Dockerfile
-  frontend:
-    build: ./frontend

docker-compose.build.yml

@@ -4,9 +4,10 @@ services:
     build: ./nginx
   api:
     build: .
+      target: api
   celery-fast:
     build: .
+      target: celery-fast
   celery-slow:
     build: .
-  frontend:
-    build: ./frontend
+      target: celery-slow

docker-compose.dev.yml

@@ -23,9 +23,3 @@ services:
     volumes:
       - ./api:/webapp/api
       - ./media:/webapp/media
-  frontend:
-    environment:
-      - DJANGO_DEVELOPMENT=true
-    volumes:
-      - ./frontend/src:/webapp/frontend/src
-    restart: always

docker-compose.gpu.yml

@@ -34,9 +34,8 @@ services:
       - api
     restart: always
   api:
-    image: jeffreyca/spleeter-web-backend:${TAG:-latest}-gpu
+    image: jeffreyca/spleeter-web-backend:${TAG:-latest}
     volumes:
-      - assets:/webapp/frontend/assets
       - sqlite-data:/webapp/sqlite
       - staticfiles:/webapp/staticfiles
     stdin_open: true
@@ -59,11 +58,9 @@ services:
       - YOUTUBE_API_KEY
     depends_on:
       - redis
-      - frontend
     restart: always
   celery-fast:
-    image: jeffreyca/spleeter-web-backend:${TAG:-latest}-gpu
-    entrypoint: ./celery-fast-entrypoint.sh
+    image: jeffreyca/spleeter-web-backend:${TAG:-latest}-celery-fast
     volumes:
       - celery-data:/webapp/celery
       - pretrained-models:/webapp/pretrained_models
@@ -74,8 +71,7 @@ services:
       - redis
     restart: always
   celery-slow:
-    image: jeffreyca/spleeter-web-backend:${TAG:-latest}-gpu
-    entrypoint: ./celery-slow-entrypoint.sh
+    image: jeffreyca/spleeter-web-celery-slow:${TAG:-latest}-gpu
     volumes:
       - celery-data:/webapp/celery
       - pretrained-models:/webapp/pretrained_models
@@ -85,14 +81,7 @@ services:
     depends_on:
       - redis
     restart: always
-  frontend:
-    image: jeffreyca/spleeter-web-frontend:${TAG:-latest}
-    volumes:
-      - assets:/webapp/frontend/assets
-    stdin_open: true
-    tty: true
 volumes:
-  assets:
   celery-data:
   pretrained-models:
   redis-data:

docker-compose.prod.yml

@@ -6,5 +6,3 @@ services:
   api:
     expose:
       - "8000"
-  frontend:
-    restart: "no"

docker-compose.yml

@@ -34,7 +34,6 @@ services:
   api:
     image: jeffreyca/spleeter-web-backend:${TAG:-latest}
     volumes:
-      - assets:/webapp/frontend/assets
       - sqlite-data:/webapp/sqlite
       - staticfiles:/webapp/staticfiles
     stdin_open: true
@@ -57,11 +56,9 @@ services:
       - YOUTUBE_API_KEY
     depends_on:
       - redis
-      - frontend
     restart: always
   celery-fast:
-    image: jeffreyca/spleeter-web-backend:${TAG:-latest}
-    entrypoint: ./celery-fast-entrypoint.sh
+    image: jeffreyca/spleeter-web-backend:${TAG:-latest}-celery-fast
     volumes:
       - celery-data:/webapp/celery
       - pretrained-models:/webapp/pretrained_models
@@ -73,8 +70,7 @@ services:
       - "8.8.8.8"
     restart: always
   celery-slow:
-    image: jeffreyca/spleeter-web-backend:${TAG:-latest}
-    entrypoint: ./celery-slow-entrypoint.sh
+    image: jeffreyca/spleeter-web-backend:${TAG:-latest}-celery-slow
     volumes:
       - celery-data:/webapp/celery
       - pretrained-models:/webapp/pretrained_models
@@ -83,14 +79,7 @@ services:
     depends_on:
       - redis
     restart: always
-  frontend:
-    image: jeffreyca/spleeter-web-frontend:${TAG:-latest}
-    volumes:
-      - assets:/webapp/frontend/assets
-    stdin_open: true
-    tty: true
 volumes:
-  assets:
   celery-data:
   pretrained-models:
   redis-data:

frontend/entrypoint.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -z "${DJANGO_DEVELOPMENT}" ]; then
+    npm run build
+else
+    npm run dev
+fi

gpu.Dockerfile

@@ -4,8 +4,7 @@ ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
 # Install all dependencies
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     software-properties-common \
     curl \
     ffmpeg \
@@ -18,22 +17,22 @@ RUN apt-get update \
     rsync \
     ssh \
     wget \
-    && add-apt-repository universe \
-    && apt-get update \
-    && apt-get -y install python3.7 python3.7-gdbm python3-distutils \
-    && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
+    && add-apt-repository universe && apt-get update && apt-get install -y \
+    python3.7 \
+    python3.7-gdbm \
+    python3-distutils \
+    && rm -rf /var/lib/apt/lists/*
+RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
     && python3.7 get-pip.py \
     && ln -s /usr/local/cuda-11.2/targets/x86_64-linux/lib/libcudart.so.11.0 /usr/lib/x86_64-linux-gnu/libcudart.so.11.0
 
-RUN mkdir -p /webapp/media /webapp/staticfiles
-
 WORKDIR /webapp
-COPY requirements.txt /webapp/
-RUN pip3 install --upgrade pip -r requirements.txt
+RUN mkdir -p /webapp/{media,staticfiles}
 
-COPY . .
+COPY requirements.txt .
+RUN pip install -r requirements.txt
 
-COPY api-entrypoint.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/api-entrypoint.sh && ln -s /usr/local/bin/api-entrypoint.sh /
+COPY . .
 
-ENTRYPOINT ["api-entrypoint.sh"]
+COPY celery-slow-entrypoint.sh .
+ENTRYPOINT ["./celery-slow-entrypoint.sh"]