Streamlined some docker update stuff

Author: t-recx

docker-compose.yml

@@ -49,12 +49,14 @@ services:
     build:
       context: ./frontend/
       dockerfile: ../docker/frontend/Dockerfile
+    command: npm run build
     volumes:
       - frontend_data:/usr/src/app/dist/frontend
   frontend-android:
     build:
       context: ./frontend/
-      dockerfile: ../docker/frontend-android/Dockerfile
+      dockerfile: ../docker/frontend/Dockerfile
+    command: npm run build-android
     volumes:
       - frontend-android_data:/usr/src/app/dist/frontend-android
   nginx:

docker/frontend-android/Dockerfile

@@ -1,10 +1,9 @@
 FROM node:10
-ENV VERSION 30
+ENV VERSION 31
 
 WORKDIR /usr/src/app
 COPY package.json ./
 RUN npm install
 
 COPY . .
-RUN npm run build
 

docker/frontend/Dockerfile

@@ -0,0 +1,14 @@
+#!/bin/bash
+sudo sh -c 'git pull && docker-compose down && docker volume rm sqtrex_frontend-android_data && docker volume rm sqtrex_frontend_data && docker-compose up -d --build && docker-compose exec wsgi python manage.py migrate --noinput'
+
+echo 'All done!'
+echo ''
+echo 'Other actions you may want to do now:'
+echo '# Seed data:'
+echo 'sudo docker-compose exec wsgi python manage.py loaddata <fixture>'
+echo ''
+echo '# See running processes:'
+echo 'sudo docker-compose ps'
+echo ''
+echo '# See logs:'
+echo 'sudo docker-compose logs'