Gisi Container:tm:

Author: Simon Berger

.docker/start.sh

@@ -0,0 +1,3 @@
+#! /usr/bin/env bash
+set -e
+exec /usr/bin/supervisord

.docker/supervisord.conf

@@ -0,0 +1,13 @@
+[supervisord]
+nodaemon=true
+
+[program:gisi]
+priority=10
+directory=/gisi
+command=python run.py
+user=root
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0

.dockerignore

@@ -0,0 +1,4 @@
+venv/
+tests/
+scripts/
+gh-pages/

Dockerfile

@@ -1,23 +1,45 @@
-FROM frolvlad/alpine-python3
-
-RUN apk update && apk add \
-    build-base \
-    freetype-dev \
-    fribidi-dev \
-    harfbuzz-dev \
-    jpeg-dev \
-    lcms2-dev \
-    libpng \
-    openjpeg-dev \
-    python3-dev \
-    tcl-dev \
-    tiff-dev \
-    tk-dev \
-    zlib-dev
-
-WORKDIR /gisi
-ADD . /gisi
+FROM python:stretch
 
+LABEL maintainer=Simon
+
+# Install required packages
+RUN apt-get -yqq update && \
+    apt-get -yqq install curl unzip && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install Chrome WebDriver
+RUN CHROMEDRIVER_VERSION=`curl -sS chromedriver.storage.googleapis.com/LATEST_RELEASE` && \
+    mkdir -p /opt/chromedriver-$CHROMEDRIVER_VERSION && \
+    curl -sS -o /tmp/chromedriver_linux64.zip http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_VERSION/chromedriver_linux64.zip && \
+    unzip -qq /tmp/chromedriver_linux64.zip -d /opt/chromedriver-$CHROMEDRIVER_VERSION && \
+    rm /tmp/chromedriver_linux64.zip && \
+    chmod +x /opt/chromedriver-$CHROMEDRIVER_VERSION/chromedriver && \
+    ln -fs /opt/chromedriver-$CHROMEDRIVER_VERSION/chromedriver /usr/local/bin/chromedriver
+
+# Install Google Chrome
+RUN curl -sS -o - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
+    echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list && \
+    apt-get -yqq update && \
+    apt-get -yqq install google-chrome-stable && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install Supervisord
+RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/*
+COPY .docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Install Python requirements
+COPY ./requirements.txt ./
 RUN pip install -r requirements.txt
 
-CMD ["python3", "run.py"]
+COPY gisi /gisi/gisi
+COPY run.py /gisi/
+COPY data /gisi/data
+RUN mkdir /gisi/logs
+
+VOLUME /gisi/logs
+VOLUME /gisi/data
+
+COPY .docker/start.sh /start.sh
+RUN chmod +x /start.sh
+
+ENTRYPOINT ["/start.sh"]

data/logging.json

@@ -1,18 +0,0 @@
-version: "3"
-services:
-  gisi:
-    image: siku2/Gisi:navi
-    links:
-      - mongo
-    depends_on:
-      - mongo
-    environment:
-      - MONGO_URL=mongodb://mongo/messageApp
-  mongo:
-    image: mongo:3.7
-    volumes:
-      - mongo:/data/db
-    expose:
-      - "27017"
-volumes:
-  mongo:

docker-compose.yml

@@ -1,3 +1,11 @@
+import logging.config
+
+from . import __logging__
+logging.config.dictConfig(__logging__)
+
+log = logging.getLogger(__name__)
+log.debug("logging setup")
+
 from .config import SetDefaults
 from .gisi import Gisi
 from .signals import GisiSignal

gisi/__init__.py

@@ -0,0 +1,53 @@
+import sys
+
+CONFIG = {
+    "version": 1,
+    "disable_existing_loggers": True,
+
+    "formatters": {
+        "detailed": {
+            "format": "{asctime} - <{name}> {message}",
+            "style": "{"
+        },
+        "color": {
+            "()": "colorlog.ColoredFormatter",
+            "format": "{log_color}{levelname:8}{reset} {bg_blue}{name}{reset} {message}",
+            "style": "{",
+            "log_colors": {
+                "DEBUG": "cyan",
+                "INFO": "green",
+                "WARNING": "yellow",
+                "ERROR": "red",
+                "CRITICAL": "red,bg_white"
+            }
+        }
+    },
+
+    "handlers": {
+        "console": {
+            "class": "logging.StreamHandler",
+            "formatter": "color"
+        },
+        "file": {
+            "class": "logging.FileHandler",
+            "filename": "logs/gisi.log",
+            "mode": "w",
+            "formatter": "detailed"
+        }
+    },
+
+    "loggers": {
+        "gisi": {
+            "level": "DEBUG",
+            "propagate": False,
+            "handlers": ["console", "file"]
+        }
+    },
+
+    "root": {
+        "level": "WARN",
+        "handlers": ["console", "file"]
+    }
+}
+
+sys.modules[__name__] = CONFIG

gisi/__logging__.py

@@ -4,7 +4,7 @@
 
 from gisi.constants import FileLocations
 
-eventory.load_ext("inktory")
+# eventory.load_ext("inktory")
 
 
 def setup(bot: Bot):

gisi/cogs/eventory.py

@@ -1,12 +1,13 @@
+import logging
 from io import BytesIO
 
-import logging
 from aiohttp import ClientConnectorError, ClientResponseError
 from discord import Embed, File
 from discord.ext.commands import command
 
 from gisi.constants import Colours
 from gisi.utils import UrlConverter
+from gisi.utils.browser import UserAgents
 
 log = logging.getLogger(__name__)
 
@@ -26,8 +27,7 @@ async def show(self, ctx, url: UrlConverter):
         """
         await ctx.message.edit(content=f"checking {url}...")
         try:
-            headers = {
-                "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:58.0) Gecko/20100101 Firefox/58.0"}
+            headers = {"User-Agent": UserAgents.DESKTOP.value}
             async with self.bot.aiosession.head(url, headers=headers, allow_redirects=True) as resp:
                 resp.raise_for_status()
                 embed_image_url = None