Refactor

Dockerfile

@@ -1,24 +1,8 @@
-FROM alpine:latest
+FROM bugy/script-server:latest
 
-ENV TZ=Europe/Kyiv
+RUN apt update && apt install -y curl gpg lsb-release \
-ARG VERSION=1.18.0
+    && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
-
+    && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \
-RUN apk add --update --no-cache  \
+    && apt-get update && apt-get install -y \
-    tzdata  \
+        openssh-client \
-    python3  \
+        docker-ce-cli
-    py3-pip  \
-    curl  \
-    bash  \
-    && rm -rf /var/cache/apk/* && mkdir -p /app mkdir -p /app/conf \
-    && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
-    && wget https://github.com/bugy/script-server/releases/download/$VERSION/script-server.zip -O /tmp/script-server.zip
-COPY app/conf.json /app/conf/conf.json
-
-WORKDIR /app
-
-RUN  unzip /tmp/script-server.zip -d /app && rm -rfv /tmp/script-server.zip && \
-     pip install --break-system-packages -r requirements.txt
-
-EXPOSE 5000
-
-CMD [ "python3", "launcher.py" ]

app/conf.json

@@ -1,4 +0,0 @@
-{
-  "title": "Script server",
-  "port": "5000"
-}

app/themes/dark/theme.css

@@ -1,42 +0,0 @@
-html:root {
-    --hover-color: rgba(255, 255, 255, 0.04);
-    --focus-color: rgba(255, 255, 255, 0.12);
-    --focus-color-solid: #424242;
-
-    --font-color-main: rgba(255, 255, 255, 0.87);
-    --font-color-medium: rgba(255, 255, 255, 0.60);
-    --font-color-disabled: rgba(255, 255, 255, 0.38);
-
-    --primary-color: #dce775;
-    --primary-color-raised-hover-solid: #E6F17F;
-    --primary-color-raised-focus-solid: #FAFF93;
-    --primary-color-when-focused: rgba(0, 0, 0, 0.12);
-    --primary-color-when-hovered: rgba(0, 0, 0, 0.04);
-    --font-on-primary-color-main: rgba(0, 0, 0, 0.87);
-    --font-on-primary-color-medium: rgba(0, 0, 0, 0.60);
-
-    --primary-color-dark-color: #a8b545;
-    --primary-color-dark-when-focused: rgba(0, 0, 0, 0.12);
-    --primary-color-dark-when-hovered: rgba(0, 0, 0, 0.04);
-    --font-on-primary-color-dark-main: rgba(0, 0, 0, 0.87);
-    --font-on-primary-color-dark-medium: rgba(0, 0, 0, 0.60);
-
-    --primary-color-light-color: #F0F4C3;
-
-    --surface-color: #121212;
-
-    --background-color: #242424;
-    --background-color-slight-emphasis: rgba(255, 255, 255, 0.05);
-    --background-color-high-emphasis: rgba(255, 255, 255, 0.09);
-    --background-color-level-4dp: rgba(255, 255, 255, 0.09);
-    --background-color-level-8dp: rgba(255, 255, 255, 0.12);
-    --background-color-level-16dp: rgba(255, 255, 255, 0.15);
-    --background-color-disabled: rgba(255, 255, 255, 0.12);
-
-    --script-header-background: url('../theme/darkBackground_header.jpg') center / cover no-repeat;
-    --login-header-background: url('../theme/darkBackground_login.jpg') center / cover no-repeat;
-
-    --separator-color: #424242;
-
-    --outline-color: rgba(255, 255, 255, 0.18);
-}

app/themes/orange/theme.css

@@ -1,14 +0,0 @@
-html:root {
-
-    --primary-color: #E64A19;
-    --primary-color-raised-hover-solid: #F05423;
-    --primary-color-raised-focus-solid: #FF7241;
-
-    --primary-color-dark-color: #BF360C;
-
-    --primary-color-light-color: #FBE9E7;
-
-    --script-header-background: #FFCC80;
-    --login-header-background: var(--primary-color-dark-color);
-
-}

conf/logging.json

@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "disable_existing_loggers": false,
+  "formatters": {
+    "simple": {
+      "format": "%(asctime)s [%(name)s.%(levelname)s] %(message)s"
+    }
+  },
+  "handlers": {
+    "console": {
+      "class": "logging.StreamHandler",
+      "level": "DEBUG",
+      "formatter": "simple",
+      "stream": "ext://sys.stdout"
+    },
+    "file": {
+      "class": "logging.FileHandler",
+      "level": "INFO",
+      "formatter": "simple"
+    }
+  },
+  "loggers": {
+  },
+  "root": {
+    "level": "DEBUG",
+    "handlers": [
+      "console",
+      "file"
+    ]
+  }
+}