refactor: macke code running (partially at least)

Author: ohrstrom

docker/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 services:
   nginx:
-    container_name: nginx
+    # container_name: nginx
     build:
       context: ${PWD}/docker/nginx/
       dockerfile: ${PWD}/docker/nginx/Dockerfile
@@ -15,7 +15,7 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
   mariadb:
-    container_name: mariadb
+    # container_name: mariadb
     image: mariadb
     restart: always
     environment:
@@ -29,7 +29,7 @@ services:
     networks:
       - obp
   rabbitmq:
-    container_name: rabbitmq
+    # container_name: rabbitmq
     build:
       context: ${PWD}/docker/rabbitmq/
       dockerfile: Dockerfile
@@ -40,7 +40,7 @@ services:
     networks:
       - obp
   redis:
-    container_name: redis
+    # container_name: redis
     image: redis:5.0.5
     ports:
       - "6379:6379"
@@ -50,6 +50,7 @@ services:
   elasticsearch:
     container_name: elasticsearch
     image: elasticsearch:6.8.20
+    platform: linux/amd64   # force amd64 - no arm image for elasticsearch 6.8
     environment:
       - cluster.name=obp
       - bootstrap.memory_lock=true
@@ -63,7 +64,7 @@ services:
     networks:
       - obp
   pushy:
-    container_name: pushy
+    # container_name: pushy
     build:
       context: ${PWD}
       dockerfile: ${PWD}/docker/pushy/Dockerfile

pyproject.toml

@@ -8,7 +8,7 @@ license = "MIT"
 packages = [{include="website", from="."}]
 
 [tool.poetry.dependencies]
-python = "^2.7"
+#python = "^2.7"
 Django = "1.8.19"
 BeautifulSoup = "3.2.1"
 Markdown = "2.4"

static/js/bundle.js

@@ -1,7 +1,7 @@
 // legacy stylesheet imports
 // TODO: check if we can remove legacy-legacy-legacy styles ;)
 import '../sass/screen.sass';
-// import '../sass/scheduler.sass';
+import '../sass/scheduler.sass';
 
 // global stylesheet import
 import '../style/main.scss';

website/apps/importer/models.py

@@ -7,7 +7,10 @@
 import unicodedata
 import string
 import ntpath
-import magic
+try:
+    import magic
+except ImportError:
+    magic = None
 from alibrary.models import Media, Artist, Release
 from celery.task import task
 from django.conf import settings