Bug fixes of deployment process (#56)

### 🔴 Bug fixes - updated up to python:3.7.17-slim-bookworm base docker image; - fixes wine installation/setup on Debian 12 Bookworm. ### 👥 Contributors @malakhovks
malakhovks · Jul 11, 2023 · 8aa6b32 · 8aa6b32
1 parent 83dd13f
commit 8aa6b32
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## v3.3.3: Bug fixes of deployment process
+
+### 🔴 Bug fixes
+
+- updated up to python:3.7.17-slim-bookworm base docker image;
+- fixes wine installation/setup on Debian 12 Bookworm.
+
+### 👥 Contributors
+
+@malakhovks
+
 ## v3.3.2, 2021-05-01
 
 ### 🔴 Виправлення помилок

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.7.10-slim-stretch
+FROM python:3.7.17-slim-bookworm
+# FROM python:3.7.10-slim-stretch
 # FROM python:3.7.7-slim-stretch
 # FROM python:2.7-slim-stretch
 
@@ -29,9 +30,12 @@ RUN chgrp -R www-data /srv/ken/deploy/konspekt \
     # install wine stable
     && apt-get install -y software-properties-common apt-transport-https \
     && dpkg --add-architecture i386 \
-    && wget -nc https://dl.winehq.org/wine-builds/winehq.key \
-    && apt-key add winehq.key \
-    && apt-add-repository https://dl.winehq.org/wine-builds/debian/ \
+    # && wget -nc https://dl.winehq.org/wine-builds/winehq.key \
+    && mkdir -pm755 /etc/apt/keyrings \
+    && wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key \
+    # && apt-key add winehq.key \
+    # && apt-add-repository https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources \
+    && wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources \
     && apt-get update \
     && apt-get install -y --install-recommends winehq-stable \
     && apt-get install -y xvfb --fix-missing \

diff --git a/README.md b/README.md
@@ -1,12 +1,18 @@
 # KEn (Konspekt English)
 
+## Donation/Funding
+
+[https://send.monobank.ua/jar/5ad56oNAcD](https://send.monobank.ua/jar/5ad56oNAcD)
+
 ### Choose your language / Оберіть мову
 - **[Українська](#toc-ua)**
 - **[English](#toc-en)**
 
 -------
 
-Актуальна версія **KEn** (Konspekt English & Ukkrainian) доступна для вільного використання в науково-дослідних та педагогічних ціляз за посиланням: [https://konspekt.ai-service.pp.ua](https://konspekt.ai-service.pp.ua/)
+Актуальна версія **KEn** (Konspekt English & Ukkrainian) доступна для вільного використання в науково-дослідних та педагогічних ціляз за посиланням: [https://ken.e-rehab.pp.ua/](https://ken.e-rehab.pp.ua//)
+
+**Important note:** ken project and documentation are in active development. For any technical clarifications and questions contact us via email: [[email protected]](mailto:[email protected]) or via Issues. The recent Russian's rocket shelling on critical infrastructure in Ukraine and Kyiv led to the shutdown of the [https://ken.e-rehab.pp.ua/](https://ken.e-rehab.pp.ua//) server.
 
 **Important note:** ken project and documentation are in active development. For any technical clarifications and questions contact us via email: [[email protected]](mailto:[email protected]) or via Issues. The recent Russian's rocket shelling on critical infrastructure in Ukraine and Kyiv led to the shutdown of the [https://konspekt.ai-service.pp.ua](https://konspekt.ai-service.pp.ua/) server.
 
@@ -984,7 +990,7 @@ jQuery.ajax({
 <a name="toc-en"></a>
 **KEn** (Konspekt English) is an NLP-powered Web service for contextual and semantic analysis with document taxonomy building feature.
 
-**Important note:** ken project and documentation are in active development. For any technical clarifications and questions contact us via email: [[email protected]](mailto:[email protected]) or via Issues. The recent Russian's rocket shelling on critical infrastructure in Ukraine and Kyiv led to the shutdown of the [https://konspekt.ai-service.pp.ua](https://konspekt.ai-service.pp.ua/) server.
+**Important note:** ken project and documentation are in active development. For any technical clarifications and questions contact us via email: [[email protected]](mailto:[email protected]) or via Issues. The recent Russian's rocket shelling on critical infrastructure in Ukraine and Kyiv led to the shutdown of the [https://ken.e-rehab.pp.ua/](https://ken.e-rehab.pp.ua//) server.
 
 ### Table of Contents
 - **[Features](#features-en)**

diff --git a/templates/en.html b/templates/en.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title>Konspekt - v3.3.2</title>
+  <title>KEn - v3.3.3</title>
   <meta charset="UTF-8">
   <link rel="shortcut icon" type="image/png" href="./static/images/favicon.png" />
   <link rel="stylesheet" type="text/css" href="./static/bootstrap/css/flatly.bootstrap.css" media="screen" />

diff --git a/templates/index.html b/templates/index.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title>Konspekt - v3.3.2</title>
+  <title>KEn - v3.3.3</title>
   <meta charset="UTF-8">
   <link rel="shortcut icon" type="image/png" href="./static/images/favicon.png" />
   <link rel="stylesheet" type="text/css" href="./static/bootstrap/css/flatly.bootstrap.css" media="screen" />
@@ -14,7 +14,7 @@
   <div class="canvas-interactive-wrapper">
     <canvas id="canvas-interactive"></canvas>
     <div class="cta-wrapper">
-      <h1 style="color: black;">КОНСПЕКТ</h1>
+      <h1 style="color: black;">KEn (former Konspekt)</h1>
       <h5>v3.3.2</h5>
       <h2 style="color: black; width: 800px;">Контекстно-семантичний аналіз природно-мовних текстів та побудова таксономії документів</h2>
       <a href="/ua" id="violet-state-cta" class="hvr-grow-shadow">Українська</a>
@@ -23,7 +23,7 @@ <h2 style="color: black; width: 800px;">Контекстно-семантичн
   </div>
   <footer class="footer">
     <!-- <p class="text-center">Платформа Python 3.8 + Nginx + uWSGI + Flask + Wine</p> -->
-    <p class="text-center">VM Glushkov Institute of Cybernetics of NAS of Ukraine &copy; Copyright 2022</p>
+    <p class="text-center">Glushkov Institute of Cybernetics of the NAS of Ukraine &copy; Copyright 2023</p>
   </footer>
 </body>
 <!-- ---------------------------------------------------------------------------------------------------- -->

diff --git a/templates/ua.html b/templates/ua.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title>Конспект - v3.3.2</title>
+  <title>KUa - v3.3.3</title>
   <meta charset="UTF-8">
   <link rel="shortcut icon" type="image/png" href="./static/images/favicon.png" />
   <link rel="stylesheet" type="text/css" href="./static/bootstrap/css/flatly.bootstrap.css" media="screen" />