Merge branch 'master' into feature/related-files

Author: psrok1

deploy/docker/Dockerfile

@@ -1,21 +1,32 @@
+FROM python:3.8-alpine AS build
+
+WORKDIR /app
+RUN python3 -m venv /app/venv
+RUN /app/venv/bin/pip --no-cache-dir install wheel
+
+RUN apk add --no-cache libffi libffi-dev py3-cffi build-base python3-dev automake m4 autoconf libtool gcc g++ musl-dev openssl-dev cargo postgresql-dev
+
+COPY requirements.txt /app
+RUN /app/venv/bin/pip --no-cache-dir install -r /app/requirements.txt
+
+COPY docker/plugins /app/plugins
+ARG plugins
+RUN for plugin in $plugins $(find /app/plugins -name 'setup.py' -exec dirname {} \; | sort -u);  \
+    do /app/venv/bin/pip --no-cache-dir install $plugin; done
+
 FROM python:3.8-alpine
 
 LABEL maintainer="info@cert.pl"
 
 RUN apk add --no-cache postgresql-client postgresql-dev libmagic
 
-COPY requirements.txt docker/plugins/requirements-*.txt /tmp/
-RUN apk add --no-cache -t build libffi libffi-dev py3-cffi build-base python3-dev automake m4 autoconf libtool gcc g++ musl-dev openssl-dev cargo \
-    && pip --no-cache-dir install -r /tmp/requirements.txt \
-    && ls /tmp/requirements-*.txt | xargs -i,, pip --no-cache-dir install -r ,, \
-    && apk del build
-
 # Copy backend files
+COPY --from=build /app/venv /app/venv
 COPY docker/ setup.py MANIFEST.in requirements.txt /app/
 COPY mwdb /app/mwdb/
 
 # Install mwdb-core package
-RUN pip install /app
+RUN /app/venv/bin/pip install /app
 
 # Create a /app/uploads directory
 # Give +r to everything in /app and +x for directories

deploy/docker/Dockerfile-web

@@ -1,20 +1,25 @@
-FROM node:14 AS build
+FROM node:16-alpine AS build
+
+LABEL maintainer="info@cert.pl"
 
 COPY ./mwdb/web /app
-COPY ./docker/plugins /plugins
+COPY ./docker/plugins /app/plugins
 
+ARG web_plugins
 RUN cd /app \
-    && npm install --unsafe-perm . $(find /plugins -name 'package.json' -printf "%h\n" | sort -u) \
+    && npm install --unsafe-perm . $web_plugins $(find /app/plugins -name 'package.json' -exec dirname {} \; | sort -u) \
     && CI=true npm run build \
     && npm cache clean --force
 
 FROM nginx:stable
 
+LABEL maintainer="info@cert.pl"
+
 ENV PROXY_BACKEND_URL http://mwdb.:8080
 
 COPY docker/nginx.conf.template /etc/nginx/conf.d/default.conf.template
 COPY docker/start-web.sh /start-web.sh
-COPY --from=build /app/build /usr/share/nginx/html
+COPY --from=build /app/dist /usr/share/nginx/html
 
 # Give +r to everything in /usr/share/nginx/html and +x for directories
 RUN chmod u=rX,go= -R /usr/share/nginx/html

deploy/docker/Dockerfile-web-dev

@@ -1,14 +1,17 @@
-FROM node:14 AS build
+FROM node:16-alpine AS build
+
+LABEL maintainer="info@cert.pl"
 
 COPY ./mwdb/web /app
-COPY ./docker/plugins /plugins
+COPY ./docker/plugins /app/plugins
 
+ARG web_plugins
 RUN cd /app \
-    && npm install --unsafe-perm . $(find /plugins -name 'package.json' -printf "%h\n" | sort -u) \
+    && npm install --unsafe-perm . $web_plugins $(find /app/plugins -name 'package.json' -exec dirname {} \; | sort -u) \
     && CI=true npm run build \
     && npm cache clean --force
 
 ENV PROXY_BACKEND_URL http://mwdb.:8080
 
 WORKDIR /app
-CMD ["npm", "run", "start"]
+CMD ["npm", "run", "dev"]

docker-compose-dev-karton.yml

@@ -26,8 +26,7 @@ services:
       # NOTE: use gen_vars.sh in order to generate this file
       - mwdb-vars.env
     environment:
-      UWSGI_PY_AUTORELOAD: 1
-      UWSGI_ENABLE_THREADS: 1
+      HOT_RELOAD: 1
       MWDB_MAIL_SMTP: "mailhog:1025"
       MWDB_MAIL_FROM: "noreply@mwdb.dev"
       MWDB_RECAPTCHA_SITE_KEY: "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"

docker-compose-dev-remote.yml

@@ -25,8 +25,7 @@ services:
       # NOTE: use gen_vars.sh in order to generate this file
       - mwdb-vars.env
     environment:
-      UWSGI_PY_AUTORELOAD: 1
-      UWSGI_ENABLE_THREADS: 1
+      HOT_RELOAD: 1
       MWDB_MAIL_SMTP: "mailhog:1025"
       MWDB_MAIL_FROM: "noreply@mwdb.dev"
       MWDB_RECAPTCHA_SITE_KEY: "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"

docker-compose-dev.yml

@@ -25,8 +25,7 @@ services:
       # NOTE: use gen_vars.sh in order to generate this file
       - mwdb-vars.env
     environment:
-      UWSGI_PY_AUTORELOAD: 1
-      UWSGI_ENABLE_THREADS: 1
+      HOT_RELOAD: 1
       MWDB_MAIL_SMTP: "mailhog:1025"
       MWDB_MAIL_FROM: "noreply@mwdb.dev"
       MWDB_RECAPTCHA_SITE_KEY: "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"
@@ -58,6 +57,7 @@ services:
     volumes:
       - "./mwdb/web/public:/app/public"
       - "./mwdb/web/src:/app/src"
+      - "./docker/plugins:/app/plugins"
     restart: on-failure
   postgres:
     image: postgres

docker-compose-e2e.yml

@@ -23,7 +23,6 @@ services:
       MWDB_BASE_URL: http://127.0.0.1
       MWDB_ENABLE_RATE_LIMIT: 0
       MWDB_ENABLE_REGISTRATION: 1
-      UWSGI_PROCESSES: 4
       MWDB_MAIL_SMTP: "mailhog:1025"
       MWDB_MAIL_FROM: "noreply@mwdb.dev"
     volumes:

docker-compose-oidc-dev.yml

@@ -25,8 +25,7 @@ services:
       # NOTE: use gen_vars.sh in order to generate this file
       - mwdb-vars.env
     environment:
-      UWSGI_PY_AUTORELOAD: 1
-      UWSGI_ENABLE_THREADS: 1
+      HOT_RELOAD: 1
       MWDB_MAIL_SMTP: "mailhog:1025"
       MWDB_MAIL_FROM: "noreply@mwdb.dev"
       MWDB_RECAPTCHA_SITE_KEY: "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"

docker/gunicorn.conf.py

@@ -0,0 +1,7 @@
+import os
+
+wsgi_app = "mwdb.app:app"
+bind = "0.0.0.0:8080"
+user = "nobody"
+reload = bool(int(os.getenv("HOT_RELOAD", "0")))
+workers = int(os.getenv("GUNICORN_WORKERS", "4"))

docker/start.sh

@@ -7,4 +7,4 @@ until psql "$MWDB_POSTGRES_URI" -c "\q" ; do
 done
 
 echo "Configuring mwdb-core instance"
-mwdb-core configure --quiet basic && exec uwsgi --ini /app/uwsgi.ini
+/app/venv/bin/mwdb-core configure --quiet basic && exec /app/venv/bin/gunicorn