From 1bd2a0f90b92b1b46b09db650c9850b051a4d874 Mon Sep 17 00:00:00 2001 From: apkraft <37011288+apkraft@users.noreply.github.com> Date: Mon, 8 Jun 2020 15:44:04 +0300 Subject: [PATCH 01/82] testrail version updated --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 78a2063..80f1718 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -53,7 +53,7 @@ foliantcontrib.superlinks >= 1.0.4 foliantcontrib.swaggerdoc >= 1.2.2 foliantcontrib.templateparser >= 1.0.4 foliantcontrib.testcoverage >= 0.1.1 -foliantcontrib.testrail >= 1.2.1 +foliantcontrib.testrail >= 1.2.2 foliantcontrib.utils.chapters >= 1.0.2 foliantcontrib.utils.combined_options >= 1.0.9 foliantcontrib.utils.header_anchors >= 1.0.1 From 149f82d48d1351e2d369b6560b3914f11a3d9a73 Mon Sep 17 00:00:00 2001 From: apkraft <37011288+apkraft@users.noreply.github.com> Date: Tue, 9 Jun 2020 14:50:15 +0300 Subject: [PATCH 02/82] flatten and testrail versions updated --- dependency_files/python_packages/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 80f1718..ed9d7ca 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -18,7 +18,7 @@ foliantcontrib.elasticsearch >= 1.0.4 foliantcontrib.epsconvert >= 1.0.7 foliantcontrib.escapecode >= 1.0.2 foliantcontrib.flags >= 1.0.2 -foliantcontrib.flatten >= 1.0.6 +foliantcontrib.flatten >= 1.0.7 foliantcontrib.glossary >= 1.0.0 foliantcontrib.graphviz >= 1.1.3 foliantcontrib.gupload >= 1.1.5 @@ -53,7 +53,7 @@ foliantcontrib.superlinks >= 1.0.4 foliantcontrib.swaggerdoc >= 1.2.2 foliantcontrib.templateparser >= 1.0.4 foliantcontrib.testcoverage >= 0.1.1 -foliantcontrib.testrail >= 1.2.2 +foliantcontrib.testrail >= 1.3.0 foliantcontrib.utils.chapters >= 1.0.2 foliantcontrib.utils.combined_options >= 1.0.9 foliantcontrib.utils.header_anchors >= 1.0.1 From 4bde9acdda5ec8176dd7887751b3875765ddcdbb Mon Sep 17 00:00:00 2001 From: apkraft <37011288+apkraft@users.noreply.github.com> Date: Wed, 10 Jun 2020 10:17:29 +0300 Subject: [PATCH 03/82] testrail version updated --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index ed9d7ca..2cf284f 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -53,7 +53,7 @@ foliantcontrib.superlinks >= 1.0.4 foliantcontrib.swaggerdoc >= 1.2.2 foliantcontrib.templateparser >= 1.0.4 foliantcontrib.testcoverage >= 0.1.1 -foliantcontrib.testrail >= 1.3.0 +foliantcontrib.testrail >= 1.3.1 foliantcontrib.utils.chapters >= 1.0.2 foliantcontrib.utils.combined_options >= 1.0.9 foliantcontrib.utils.header_anchors >= 1.0.1 From 99479f686a37e8d4e3a09714ea9dc268a317071d Mon Sep 17 00:00:00 2001 From: Artemy Lomov Date: Thu, 11 Jun 2020 14:25:11 +0300 Subject: [PATCH 04/82] =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D1=83=D0=B5=D0=BC=20Puppeteer=203.3.0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-full | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-full b/Dockerfile-full index 266f1fd..2a9be28 100644 --- a/Dockerfile-full +++ b/Dockerfile-full @@ -17,7 +17,7 @@ RUN wget -q -O - https://deb.nodesource.com/setup_11.x | bash RUN apt install -y nodejs -RUN npm install puppeteer@2.0.0 +RUN npm install puppeteer@3.3.0 RUN npm install -g widdershins From 302928a972f8b747174340363e7162e8e8d3cee5 Mon Sep 17 00:00:00 2001 From: minuhin Date: Tue, 16 Jun 2020 11:45:08 +0300 Subject: [PATCH 05/82] update confluence version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 2cf284f..cdfeb71 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -11,7 +11,7 @@ foliantcontrib.blockdiag >= 1.0.5 foliantcontrib.bump >= 1.0.2 foliantcontrib.csvtables >= 1.0.1 foliantcontrib.customids >= 1.0.6 -foliantcontrib.confluence >= 0.6.10 +foliantcontrib.confluence >= 0.6.11 foliantcontrib.dbmldoc >= 0.2.4 foliantcontrib.dbdoc >= 0.1.2 foliantcontrib.elasticsearch >= 1.0.4 From c72d9fa37cca757afc82718d4def3dba0b6f1db6 Mon Sep 17 00:00:00 2001 From: minuhin Date: Thu, 9 Jul 2020 09:39:28 +0300 Subject: [PATCH 06/82] update includes version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index cdfeb71..99659c9 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -26,7 +26,7 @@ foliantcontrib.history >= 1.0.8 foliantcontrib.imagemagick >= 1.0.2 foliantcontrib.imgcaptions >= 1.0.2 foliantcontrib.imgconvert >= 1.0.0 -foliantcontrib.includes >= 1.1.9 +foliantcontrib.includes >= 1.1.10 foliantcontrib.init >= 1.0.7 foliantcontrib.macros >= 1.0.4 foliantcontrib.mdtopdf >= 1.0.0 From 0e92de32b6a3aab0676f369aafce948812dcd983 Mon Sep 17 00:00:00 2001 From: minuhin Date: Thu, 9 Jul 2020 10:33:30 +0300 Subject: [PATCH 07/82] update link to slate gemfile in dockerfile-full --- Dockerfile-full | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile-full b/Dockerfile-full index 2a9be28..d32a019 100644 --- a/Dockerfile-full +++ b/Dockerfile-full @@ -32,8 +32,8 @@ RUN npm install -g raml2html raml2html-full-markdown-theme RUN mkdir -p /usr/src/app/dependency_files/slate/ \ && cd /usr/src/app/dependency_files/slate/ \ - && wget -O ./Gemfile https://raw.githubusercontent.com/slatedocs/slate/master/Gemfile \ - && wget -O ./Gemfile.lock https://raw.githubusercontent.com/slatedocs/slate/master/Gemfile.lock \ + && wget -O ./Gemfile https://raw.githubusercontent.com/slatedocs/slate/main/Gemfile \ + && wget -O ./Gemfile.lock https://raw.githubusercontent.com/slatedocs/slate/main/Gemfile.lock \ && apt install -y zlib1g-dev ruby-full \ && gem install bundler \ && bundle install From e50c83a684de2e09ab81e6efacdf9b61fbad09cf Mon Sep 17 00:00:00 2001 From: minuhin Date: Thu, 9 Jul 2020 11:23:30 +0300 Subject: [PATCH 08/82] update includes --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 99659c9..20f5ec3 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -26,7 +26,7 @@ foliantcontrib.history >= 1.0.8 foliantcontrib.imagemagick >= 1.0.2 foliantcontrib.imgcaptions >= 1.0.2 foliantcontrib.imgconvert >= 1.0.0 -foliantcontrib.includes >= 1.1.10 +foliantcontrib.includes >= 1.1.11 foliantcontrib.init >= 1.0.7 foliantcontrib.macros >= 1.0.4 foliantcontrib.mdtopdf >= 1.0.0 From 453e5e4c721ff13696b9af8e3b4d015f079a8c41 Mon Sep 17 00:00:00 2001 From: apkraft <37011288+apkraft@users.noreply.github.com> Date: Thu, 9 Jul 2020 13:29:37 +0300 Subject: [PATCH 09/82] multilinetables version updated --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 20f5ec3..e225dc0 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -34,7 +34,7 @@ foliantcontrib.mermaid >= 1.0.1 foliantcontrib.meta >= 1.3.2 foliantcontrib.metagraph >= 0.1.2 foliantcontrib.mkdocs >= 1.0.11 -foliantcontrib.multilinetables >= 1.2.2 +foliantcontrib.multilinetables >= 1.2.3 foliantcontrib.multiproject >= 1.0.13 foliantcontrib.notifier >= 1.0.0 foliantcontrib.pandoc >= 1.0.10 From 4ce75670dd5cc88b2efee2900219b650d5f5e022 Mon Sep 17 00:00:00 2001 From: minuhin Date: Tue, 14 Jul 2020 15:50:13 +0300 Subject: [PATCH 10/82] update confluence version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index e225dc0..b8a7bea 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -11,7 +11,7 @@ foliantcontrib.blockdiag >= 1.0.5 foliantcontrib.bump >= 1.0.2 foliantcontrib.csvtables >= 1.0.1 foliantcontrib.customids >= 1.0.6 -foliantcontrib.confluence >= 0.6.11 +foliantcontrib.confluence >= 0.6.12 foliantcontrib.dbmldoc >= 0.2.4 foliantcontrib.dbdoc >= 0.1.2 foliantcontrib.elasticsearch >= 1.0.4 From c88c552f86f196af6c97c1173a1f275b0b0f0db5 Mon Sep 17 00:00:00 2001 From: Artemy Lomov Date: Wed, 22 Jul 2020 18:43:35 +0300 Subject: [PATCH 11/82] Update versions of Ubuntu, Pandoc, and Python packages. --- Dockerfile-pandoc | 2 +- Dockerfile-slim | 2 +- dependency_files/python_packages/requirements.txt | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile-pandoc b/Dockerfile-pandoc index 99ad3b2..e47e03c 100644 --- a/Dockerfile-pandoc +++ b/Dockerfile-pandoc @@ -2,5 +2,5 @@ FROM foliant/foliant ENV DEBIAN_FRONTEND noninteractive RUN apt update && apt install -y wget texlive-full librsvg2-bin -RUN wget https://github.com/jgm/pandoc/releases/download/2.9.2/pandoc-2.9.2-1-amd64.deb && dpkg -i pandoc-2.9.2-1-amd64.deb +RUN wget https://github.com/jgm/pandoc/releases/download/2.10/pandoc-2.10-1-amd64.deb && dpkg -i pandoc-2.10-1-amd64.deb RUN pip3 install foliantcontrib.pandoc diff --git a/Dockerfile-slim b/Dockerfile-slim index d919384..078e7f8 100644 --- a/Dockerfile-slim +++ b/Dockerfile-slim @@ -1,4 +1,4 @@ -FROM ubuntu:eoan +FROM ubuntu:focal LABEL authors="Konstantin Molchanov " diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index b8a7bea..609b784 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -16,7 +16,7 @@ foliantcontrib.dbmldoc >= 0.2.4 foliantcontrib.dbdoc >= 0.1.2 foliantcontrib.elasticsearch >= 1.0.4 foliantcontrib.epsconvert >= 1.0.7 -foliantcontrib.escapecode >= 1.0.2 +foliantcontrib.escapecode >= 1.0.3 foliantcontrib.flags >= 1.0.2 foliantcontrib.flatten >= 1.0.7 foliantcontrib.glossary >= 1.0.0 @@ -33,11 +33,11 @@ foliantcontrib.mdtopdf >= 1.0.0 foliantcontrib.mermaid >= 1.0.1 foliantcontrib.meta >= 1.3.2 foliantcontrib.metagraph >= 0.1.2 -foliantcontrib.mkdocs >= 1.0.11 +foliantcontrib.mkdocs >= 1.0.12 foliantcontrib.multilinetables >= 1.2.3 -foliantcontrib.multiproject >= 1.0.13 +foliantcontrib.multiproject >= 1.0.14 foliantcontrib.notifier >= 1.0.0 -foliantcontrib.pandoc >= 1.0.10 +foliantcontrib.pandoc >= 1.0.11 foliantcontrib.pgsqldoc >= 1.1.6 foliantcontrib.plantuml >= 1.0.6 foliantcontrib.project_graph >= 1.0.1 From f9bbcc49b0fca70850740c215a03437df69fd892 Mon Sep 17 00:00:00 2001 From: Artemy Lomov Date: Wed, 22 Jul 2020 19:38:56 +0300 Subject: [PATCH 12/82] Require Node 14.x, Puppeteer 5.2.1. --- Dockerfile-full | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile-full b/Dockerfile-full index d32a019..432722d 100644 --- a/Dockerfile-full +++ b/Dockerfile-full @@ -13,11 +13,11 @@ RUN rm -rf /etc/ImageMagick-6/policy.xml \ # Needed for Puppeteer RUN apt install -y libasound2 -RUN wget -q -O - https://deb.nodesource.com/setup_11.x | bash +RUN wget -q -O - https://deb.nodesource.com/setup_14.x | bash RUN apt install -y nodejs -RUN npm install puppeteer@3.3.0 +RUN npm install puppeteer@5.2.1 RUN npm install -g widdershins From caf7af1127f829ed6c8f58e2f8d13949ae8eb1c9 Mon Sep 17 00:00:00 2001 From: Artemy Lomov Date: Wed, 22 Jul 2020 20:11:34 +0300 Subject: [PATCH 13/82] Temporarily disable foliantcontrib.project_graph installation. --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 609b784..d353d5f 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -40,7 +40,7 @@ foliantcontrib.notifier >= 1.0.0 foliantcontrib.pandoc >= 1.0.11 foliantcontrib.pgsqldoc >= 1.1.6 foliantcontrib.plantuml >= 1.0.6 -foliantcontrib.project_graph >= 1.0.1 +# foliantcontrib.project_graph >= 1.0.1 foliantcontrib.ramldoc >= 1.0.1 foliantcontrib.removeexcess >= 1.0.0 foliantcontrib.replace >= 1.0.4 From 1328668af4de14802bc80852e286791679a636b7 Mon Sep 17 00:00:00 2001 From: Artemy Lomov Date: Wed, 22 Jul 2020 20:17:45 +0300 Subject: [PATCH 14/82] Use Node 12.x. --- Dockerfile-full | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-full b/Dockerfile-full index 432722d..e7f4504 100644 --- a/Dockerfile-full +++ b/Dockerfile-full @@ -13,7 +13,7 @@ RUN rm -rf /etc/ImageMagick-6/policy.xml \ # Needed for Puppeteer RUN apt install -y libasound2 -RUN wget -q -O - https://deb.nodesource.com/setup_14.x | bash +RUN wget -q -O - https://deb.nodesource.com/setup_12.x | bash RUN apt install -y nodejs From 4737dd6f2de2f0268e2fa94d8e9d015856435c97 Mon Sep 17 00:00:00 2001 From: Artemy Lomov Date: Wed, 29 Jul 2020 06:01:23 +0300 Subject: [PATCH 15/82] Require Includes 1.1.12 for the full image. --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index d353d5f..839f47b 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -26,7 +26,7 @@ foliantcontrib.history >= 1.0.8 foliantcontrib.imagemagick >= 1.0.2 foliantcontrib.imgcaptions >= 1.0.2 foliantcontrib.imgconvert >= 1.0.0 -foliantcontrib.includes >= 1.1.11 +foliantcontrib.includes >= 1.1.12 foliantcontrib.init >= 1.0.7 foliantcontrib.macros >= 1.0.4 foliantcontrib.mdtopdf >= 1.0.0 From 553992368752422feab7bea2ccf6730b86de6248 Mon Sep 17 00:00:00 2001 From: Artemy Lomov Date: Wed, 29 Jul 2020 09:14:37 +0300 Subject: [PATCH 16/82] Require Includes 1.1.13 for the full image. --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 839f47b..baad461 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -26,7 +26,7 @@ foliantcontrib.history >= 1.0.8 foliantcontrib.imagemagick >= 1.0.2 foliantcontrib.imgcaptions >= 1.0.2 foliantcontrib.imgconvert >= 1.0.0 -foliantcontrib.includes >= 1.1.12 +foliantcontrib.includes >= 1.1.13 foliantcontrib.init >= 1.0.7 foliantcontrib.macros >= 1.0.4 foliantcontrib.mdtopdf >= 1.0.0 From c2f5861ae03c869f14be69edc1a31b6f2abc0325 Mon Sep 17 00:00:00 2001 From: Artemy Lomov Date: Fri, 31 Jul 2020 00:12:55 +0300 Subject: [PATCH 17/82] Require EscapeCode 1.0.4 for the full image. --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index baad461..9a9fdaf 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -16,7 +16,7 @@ foliantcontrib.dbmldoc >= 0.2.4 foliantcontrib.dbdoc >= 0.1.2 foliantcontrib.elasticsearch >= 1.0.4 foliantcontrib.epsconvert >= 1.0.7 -foliantcontrib.escapecode >= 1.0.3 +foliantcontrib.escapecode >= 1.0.4 foliantcontrib.flags >= 1.0.2 foliantcontrib.flatten >= 1.0.7 foliantcontrib.glossary >= 1.0.0 From b5619215a8ea5537c3caf5c36ec90f69ba805977 Mon Sep 17 00:00:00 2001 From: minuhin Date: Fri, 21 Aug 2020 12:39:05 +0300 Subject: [PATCH 18/82] add mssql and mysql into image --- Dockerfile-full | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Dockerfile-full b/Dockerfile-full index e7f4504..693b629 100644 --- a/Dockerfile-full +++ b/Dockerfile-full @@ -19,6 +19,22 @@ RUN apt install -y nodejs RUN npm install puppeteer@5.2.1 +####################### +# Databases for DBDoc # +####################### + +# MS SQL Server +RUN apt-get install -y unixodbc-dev +RUN wget -qO- https://packages.microsoft.com/keys/microsoft.asc | apt-key add - +RUN wget -O /etc/apt/sources.list.d/mssql-release.list https://packages.microsoft.com/config/ubuntu/20.04/prod.list +RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql17 + +# MySQL +RUN apt-get install -y mysql-server libmysqlclient-dev + +####################### + RUN npm install -g widdershins RUN npm install -g mermaid \ From 7ca52f205d97cc5299514e3108c1a776f2d30089 Mon Sep 17 00:00:00 2001 From: minuhin Date: Fri, 21 Aug 2020 12:39:24 +0300 Subject: [PATCH 19/82] update dbdoc version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 9a9fdaf..a994d8e 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -13,7 +13,7 @@ foliantcontrib.csvtables >= 1.0.1 foliantcontrib.customids >= 1.0.6 foliantcontrib.confluence >= 0.6.12 foliantcontrib.dbmldoc >= 0.2.4 -foliantcontrib.dbdoc >= 0.1.2 +foliantcontrib.dbdoc >= 0.1.4 foliantcontrib.elasticsearch >= 1.0.4 foliantcontrib.epsconvert >= 1.0.7 foliantcontrib.escapecode >= 1.0.4 From 6a8c1da65dfbdcb9c976257c82449bd24b5ed9a3 Mon Sep 17 00:00:00 2001 From: minuhin Date: Fri, 21 Aug 2020 13:40:27 +0300 Subject: [PATCH 20/82] update confluence version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index a994d8e..57a122f 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -11,7 +11,7 @@ foliantcontrib.blockdiag >= 1.0.5 foliantcontrib.bump >= 1.0.2 foliantcontrib.csvtables >= 1.0.1 foliantcontrib.customids >= 1.0.6 -foliantcontrib.confluence >= 0.6.12 +foliantcontrib.confluence >= 0.6.13 foliantcontrib.dbmldoc >= 0.2.4 foliantcontrib.dbdoc >= 0.1.4 foliantcontrib.elasticsearch >= 1.0.4 From 189100530aaf174e2366a4d501f96d9e24343564 Mon Sep 17 00:00:00 2001 From: Artemy Lomov Date: Sat, 22 Aug 2020 06:38:41 +0300 Subject: [PATCH 21/82] Require foliantcontrib.reindexer for the full image. --- dependency_files/python_packages/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 57a122f..df07981 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -42,6 +42,7 @@ foliantcontrib.pgsqldoc >= 1.1.6 foliantcontrib.plantuml >= 1.0.6 # foliantcontrib.project_graph >= 1.0.1 foliantcontrib.ramldoc >= 1.0.1 +foliantcontrib.reindexer >= 1.0.0 foliantcontrib.removeexcess >= 1.0.0 foliantcontrib.replace >= 1.0.4 foliantcontrib.runcommands >= 1.0.1 From 3193b56211211411edaba60a80e9ef8823ab49d7 Mon Sep 17 00:00:00 2001 From: minuhin Date: Mon, 24 Aug 2020 13:08:55 +0300 Subject: [PATCH 22/82] update swaggerdoc version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index df07981..2cb0a26 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -51,7 +51,7 @@ foliantcontrib.slate >= 1.0.8 foliantcontrib.slugs >= 1.0.1 foliantcontrib.subset >= 1.0.9 foliantcontrib.superlinks >= 1.0.4 -foliantcontrib.swaggerdoc >= 1.2.2 +foliantcontrib.swaggerdoc >= 1.2.3 foliantcontrib.templateparser >= 1.0.4 foliantcontrib.testcoverage >= 0.1.1 foliantcontrib.testrail >= 1.3.1 From 507ce3ca8e5e944ce4339fd62a6666262e55ec26 Mon Sep 17 00:00:00 2001 From: minuhin Date: Wed, 26 Aug 2020 09:37:27 +0300 Subject: [PATCH 23/82] update header_anchors, preprocessor_ext and superlinks versions --- dependency_files/python_packages/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 2cb0a26..08f6394 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -50,15 +50,15 @@ foliantcontrib.showcommits >= 1.0.2 foliantcontrib.slate >= 1.0.8 foliantcontrib.slugs >= 1.0.1 foliantcontrib.subset >= 1.0.9 -foliantcontrib.superlinks >= 1.0.4 +foliantcontrib.superlinks >= 1.0.6 foliantcontrib.swaggerdoc >= 1.2.3 foliantcontrib.templateparser >= 1.0.4 foliantcontrib.testcoverage >= 0.1.1 foliantcontrib.testrail >= 1.3.1 foliantcontrib.utils.chapters >= 1.0.2 foliantcontrib.utils.combined_options >= 1.0.9 -foliantcontrib.utils.header_anchors >= 1.0.1 -foliantcontrib.utils.preprocessor_ext >= 1.0.3 +foliantcontrib.utils.header_anchors >= 1.0.2 +foliantcontrib.utils.preprocessor_ext >= 1.0.4 archeme >= 1.0.2 From 779c09b1054ff4c0534ee0ffa9dcd7d71f1def6a Mon Sep 17 00:00:00 2001 From: Artemy Lomov Date: Mon, 7 Sep 2020 04:40:13 +0300 Subject: [PATCH 24/82] Require foliantcontrib.reindexer 1.0.1 for the full image. --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 08f6394..22c520d 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -42,7 +42,7 @@ foliantcontrib.pgsqldoc >= 1.1.6 foliantcontrib.plantuml >= 1.0.6 # foliantcontrib.project_graph >= 1.0.1 foliantcontrib.ramldoc >= 1.0.1 -foliantcontrib.reindexer >= 1.0.0 +foliantcontrib.reindexer >= 1.0.1 foliantcontrib.removeexcess >= 1.0.0 foliantcontrib.replace >= 1.0.4 foliantcontrib.runcommands >= 1.0.1 From d544076abd91f88031f6ae1dd472fbe6baed139d Mon Sep 17 00:00:00 2001 From: Artemy Lomov Date: Wed, 16 Sep 2020 14:28:53 +0300 Subject: [PATCH 25/82] Require foliantcontrib.archeme 1.0.3 for the full image. --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 22c520d..0f7863e 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -3,7 +3,7 @@ foliantcontrib.aglio >= 1.0.0 foliantcontrib.alt_structure >= 0.2.0 foliantcontrib.anchors >= 1.0.4 foliantcontrib.apilinks >= 1.1.3 -foliantcontrib.archeme >= 1.0.2 +foliantcontrib.archeme >= 1.0.3 foliantcontrib.badges >= 1.0.2 foliantcontrib.bindfigma >= 1.0.3 foliantcontrib.bindsympli >= 1.0.13 From 981caf61a51085245addcf185f1b355362841383 Mon Sep 17 00:00:00 2001 From: minuhin Date: Tue, 6 Oct 2020 18:27:49 +0300 Subject: [PATCH 26/82] update apilinks version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 0f7863e..3dacc2c 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -2,7 +2,7 @@ foliantcontrib.admonitions >= 1.0.0 foliantcontrib.aglio >= 1.0.0 foliantcontrib.alt_structure >= 0.2.0 foliantcontrib.anchors >= 1.0.4 -foliantcontrib.apilinks >= 1.1.3 +foliantcontrib.apilinks >= 1.2.0 foliantcontrib.archeme >= 1.0.3 foliantcontrib.badges >= 1.0.2 foliantcontrib.bindfigma >= 1.0.3 From b65f6caf9604a310126f97b25c5c1b188b007d42 Mon Sep 17 00:00:00 2001 From: minuhin Date: Wed, 7 Oct 2020 12:59:38 +0300 Subject: [PATCH 27/82] update apilinks version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 3dacc2c..edc335c 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -2,7 +2,7 @@ foliantcontrib.admonitions >= 1.0.0 foliantcontrib.aglio >= 1.0.0 foliantcontrib.alt_structure >= 0.2.0 foliantcontrib.anchors >= 1.0.4 -foliantcontrib.apilinks >= 1.2.0 +foliantcontrib.apilinks >= 1.2.1 foliantcontrib.archeme >= 1.0.3 foliantcontrib.badges >= 1.0.2 foliantcontrib.bindfigma >= 1.0.3 From f35e8d682c5ed807621b6c33b6e8e297110dcb3c Mon Sep 17 00:00:00 2001 From: minuhin Date: Thu, 8 Oct 2020 13:14:41 +0300 Subject: [PATCH 28/82] update utils.chapters and superlinks versions --- dependency_files/python_packages/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index edc335c..170756d 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -50,12 +50,12 @@ foliantcontrib.showcommits >= 1.0.2 foliantcontrib.slate >= 1.0.8 foliantcontrib.slugs >= 1.0.1 foliantcontrib.subset >= 1.0.9 -foliantcontrib.superlinks >= 1.0.6 +foliantcontrib.superlinks >= 1.0.7 foliantcontrib.swaggerdoc >= 1.2.3 foliantcontrib.templateparser >= 1.0.4 foliantcontrib.testcoverage >= 0.1.1 foliantcontrib.testrail >= 1.3.1 -foliantcontrib.utils.chapters >= 1.0.2 +foliantcontrib.utils.chapters >= 1.0.3 foliantcontrib.utils.combined_options >= 1.0.9 foliantcontrib.utils.header_anchors >= 1.0.2 foliantcontrib.utils.preprocessor_ext >= 1.0.4 From 3432439e30e2bdef929ef7cf73d39ef568822056 Mon Sep 17 00:00:00 2001 From: minuhin Date: Wed, 14 Oct 2020 18:03:28 +0300 Subject: [PATCH 29/82] update graphviz preprocessor version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 170756d..52f38e7 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -20,7 +20,7 @@ foliantcontrib.escapecode >= 1.0.4 foliantcontrib.flags >= 1.0.2 foliantcontrib.flatten >= 1.0.7 foliantcontrib.glossary >= 1.0.0 -foliantcontrib.graphviz >= 1.1.3 +foliantcontrib.graphviz >= 1.1.4 foliantcontrib.gupload >= 1.1.5 foliantcontrib.history >= 1.0.8 foliantcontrib.imagemagick >= 1.0.2 From b1c9a3cf75bfe463622c28b4b040dd657ce7f310 Mon Sep 17 00:00:00 2001 From: minuhin Date: Fri, 16 Oct 2020 13:37:14 +0300 Subject: [PATCH 30/82] update confluence version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 52f38e7..c6c7917 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -11,7 +11,7 @@ foliantcontrib.blockdiag >= 1.0.5 foliantcontrib.bump >= 1.0.2 foliantcontrib.csvtables >= 1.0.1 foliantcontrib.customids >= 1.0.6 -foliantcontrib.confluence >= 0.6.13 +foliantcontrib.confluence >= 0.6.14 foliantcontrib.dbmldoc >= 0.2.4 foliantcontrib.dbdoc >= 0.1.4 foliantcontrib.elasticsearch >= 1.0.4 From 43cdeac52ca3dd1a244eecc6dddac7578bc812d2 Mon Sep 17 00:00:00 2001 From: minuhin Date: Wed, 21 Oct 2020 10:23:14 +0300 Subject: [PATCH 31/82] update pandoc version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index c6c7917..bd7abc4 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -37,7 +37,7 @@ foliantcontrib.mkdocs >= 1.0.12 foliantcontrib.multilinetables >= 1.2.3 foliantcontrib.multiproject >= 1.0.14 foliantcontrib.notifier >= 1.0.0 -foliantcontrib.pandoc >= 1.0.11 +foliantcontrib.pandoc >= 1.1.0 foliantcontrib.pgsqldoc >= 1.1.6 foliantcontrib.plantuml >= 1.0.6 # foliantcontrib.project_graph >= 1.0.1 From 6716d5619062d5e7f192d7cbdd13274e89293676 Mon Sep 17 00:00:00 2001 From: minuhin Date: Wed, 28 Oct 2020 11:01:58 +0300 Subject: [PATCH 32/82] update superlinks and utils.chapters versions --- dependency_files/python_packages/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index bd7abc4..991773f 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -50,12 +50,12 @@ foliantcontrib.showcommits >= 1.0.2 foliantcontrib.slate >= 1.0.8 foliantcontrib.slugs >= 1.0.1 foliantcontrib.subset >= 1.0.9 -foliantcontrib.superlinks >= 1.0.7 +foliantcontrib.superlinks >= 1.0.8 foliantcontrib.swaggerdoc >= 1.2.3 foliantcontrib.templateparser >= 1.0.4 foliantcontrib.testcoverage >= 0.1.1 foliantcontrib.testrail >= 1.3.1 -foliantcontrib.utils.chapters >= 1.0.3 +foliantcontrib.utils.chapters >= 1.0.4 foliantcontrib.utils.combined_options >= 1.0.9 foliantcontrib.utils.header_anchors >= 1.0.2 foliantcontrib.utils.preprocessor_ext >= 1.0.4 From 548cecdea06533f1ffdbc2cd2e0a4cfcc55db12d Mon Sep 17 00:00:00 2001 From: minuhin Date: Mon, 2 Nov 2020 22:10:29 +0300 Subject: [PATCH 33/82] update apilinks version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 991773f..18cacec 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -2,7 +2,7 @@ foliantcontrib.admonitions >= 1.0.0 foliantcontrib.aglio >= 1.0.0 foliantcontrib.alt_structure >= 0.2.0 foliantcontrib.anchors >= 1.0.4 -foliantcontrib.apilinks >= 1.2.1 +foliantcontrib.apilinks >= 1.2.2 foliantcontrib.archeme >= 1.0.3 foliantcontrib.badges >= 1.0.2 foliantcontrib.bindfigma >= 1.0.3 From c05a108c0c1e6615a9906612c907517d1cc0e9cd Mon Sep 17 00:00:00 2001 From: minuhin Date: Thu, 12 Nov 2020 12:27:48 +0300 Subject: [PATCH 34/82] update plantuml preprocessor version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 18cacec..4c74509 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -39,7 +39,7 @@ foliantcontrib.multiproject >= 1.0.14 foliantcontrib.notifier >= 1.0.0 foliantcontrib.pandoc >= 1.1.0 foliantcontrib.pgsqldoc >= 1.1.6 -foliantcontrib.plantuml >= 1.0.6 +foliantcontrib.plantuml >= 1.0.7 # foliantcontrib.project_graph >= 1.0.1 foliantcontrib.ramldoc >= 1.0.1 foliantcontrib.reindexer >= 1.0.1 From 353f6acfbf5fe110c065380199387835f13f40f3 Mon Sep 17 00:00:00 2001 From: minuhin Date: Tue, 17 Nov 2020 10:58:49 +0300 Subject: [PATCH 35/82] update versions customids, preprocessor_ext, add utils --- dependency_files/python_packages/requirements.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 4c74509..6b372ce 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -10,7 +10,7 @@ foliantcontrib.bindsympli >= 1.0.13 foliantcontrib.blockdiag >= 1.0.5 foliantcontrib.bump >= 1.0.2 foliantcontrib.csvtables >= 1.0.1 -foliantcontrib.customids >= 1.0.6 +foliantcontrib.customids >= 1.0.7 foliantcontrib.confluence >= 0.6.14 foliantcontrib.dbmldoc >= 0.2.4 foliantcontrib.dbdoc >= 0.1.4 @@ -55,10 +55,11 @@ foliantcontrib.swaggerdoc >= 1.2.3 foliantcontrib.templateparser >= 1.0.4 foliantcontrib.testcoverage >= 0.1.1 foliantcontrib.testrail >= 1.3.1 +foliantcontrib.utils >= 1.0.0 foliantcontrib.utils.chapters >= 1.0.4 foliantcontrib.utils.combined_options >= 1.0.9 foliantcontrib.utils.header_anchors >= 1.0.2 -foliantcontrib.utils.preprocessor_ext >= 1.0.4 +foliantcontrib.utils.preprocessor_ext >= 1.0.5 archeme >= 1.0.2 From 908a9306b45d4a7fcf259da79b706b73a4d6ef71 Mon Sep 17 00:00:00 2001 From: minuhin Date: Fri, 20 Nov 2020 11:57:34 +0300 Subject: [PATCH 36/82] update versions: combined_options, anchors, header_anchors --- dependency_files/python_packages/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 6b372ce..f6de0a5 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -1,7 +1,7 @@ foliantcontrib.admonitions >= 1.0.0 foliantcontrib.aglio >= 1.0.0 foliantcontrib.alt_structure >= 0.2.0 -foliantcontrib.anchors >= 1.0.4 +foliantcontrib.anchors >= 1.0.5 foliantcontrib.apilinks >= 1.2.2 foliantcontrib.archeme >= 1.0.3 foliantcontrib.badges >= 1.0.2 @@ -57,8 +57,8 @@ foliantcontrib.testcoverage >= 0.1.1 foliantcontrib.testrail >= 1.3.1 foliantcontrib.utils >= 1.0.0 foliantcontrib.utils.chapters >= 1.0.4 -foliantcontrib.utils.combined_options >= 1.0.9 -foliantcontrib.utils.header_anchors >= 1.0.2 +foliantcontrib.utils.combined_options >= 1.0.10 +foliantcontrib.utils.header_anchors >= 1.0.3 foliantcontrib.utils.preprocessor_ext >= 1.0.5 archeme >= 1.0.2 From 241357316eb0ef94e04b9840b0c5ef21c1c49c27 Mon Sep 17 00:00:00 2001 From: minuhin Date: Fri, 27 Nov 2020 17:12:39 +0300 Subject: [PATCH 37/82] update superlinks version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index f6de0a5..b88dcdc 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -50,7 +50,7 @@ foliantcontrib.showcommits >= 1.0.2 foliantcontrib.slate >= 1.0.8 foliantcontrib.slugs >= 1.0.1 foliantcontrib.subset >= 1.0.9 -foliantcontrib.superlinks >= 1.0.8 +foliantcontrib.superlinks >= 1.0.9 foliantcontrib.swaggerdoc >= 1.2.3 foliantcontrib.templateparser >= 1.0.4 foliantcontrib.testcoverage >= 0.1.1 From e496c86643d4ab2a461665ee18ea8327ca9e5024 Mon Sep 17 00:00:00 2001 From: apkraft <37011288+apkraft@users.noreply.github.com> Date: Thu, 3 Dec 2020 14:24:12 +0300 Subject: [PATCH 38/82] replace version updated --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index b88dcdc..9927c05 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -44,7 +44,7 @@ foliantcontrib.plantuml >= 1.0.7 foliantcontrib.ramldoc >= 1.0.1 foliantcontrib.reindexer >= 1.0.1 foliantcontrib.removeexcess >= 1.0.0 -foliantcontrib.replace >= 1.0.4 +foliantcontrib.replace >= 1.0.5 foliantcontrib.runcommands >= 1.0.1 foliantcontrib.showcommits >= 1.0.2 foliantcontrib.slate >= 1.0.8 From 9e483e8d1d4261852a9209b310d06d82351eff65 Mon Sep 17 00:00:00 2001 From: minuhin Date: Fri, 4 Dec 2020 11:58:55 +0300 Subject: [PATCH 39/82] update templateparser version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 9927c05..f095f5c 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -52,7 +52,7 @@ foliantcontrib.slugs >= 1.0.1 foliantcontrib.subset >= 1.0.9 foliantcontrib.superlinks >= 1.0.9 foliantcontrib.swaggerdoc >= 1.2.3 -foliantcontrib.templateparser >= 1.0.4 +foliantcontrib.templateparser >= 1.0.5 foliantcontrib.testcoverage >= 0.1.1 foliantcontrib.testrail >= 1.3.1 foliantcontrib.utils >= 1.0.0 From 9df99d328721c937469e147575af0cb4c96f248c Mon Sep 17 00:00:00 2001 From: minuhin Date: Mon, 25 Jan 2021 14:33:45 +0300 Subject: [PATCH 40/82] update apilinks and dbdoc versions --- dependency_files/python_packages/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index f095f5c..f64e17a 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -2,7 +2,7 @@ foliantcontrib.admonitions >= 1.0.0 foliantcontrib.aglio >= 1.0.0 foliantcontrib.alt_structure >= 0.2.0 foliantcontrib.anchors >= 1.0.5 -foliantcontrib.apilinks >= 1.2.2 +foliantcontrib.apilinks >= 1.2.3 foliantcontrib.archeme >= 1.0.3 foliantcontrib.badges >= 1.0.2 foliantcontrib.bindfigma >= 1.0.3 @@ -13,7 +13,7 @@ foliantcontrib.csvtables >= 1.0.1 foliantcontrib.customids >= 1.0.7 foliantcontrib.confluence >= 0.6.14 foliantcontrib.dbmldoc >= 0.2.4 -foliantcontrib.dbdoc >= 0.1.4 +foliantcontrib.dbdoc >= 0.1.6 foliantcontrib.elasticsearch >= 1.0.4 foliantcontrib.epsconvert >= 1.0.7 foliantcontrib.escapecode >= 1.0.4 From 98edd190cad15d3c1a13d8521b2489c245ba028b Mon Sep 17 00:00:00 2001 From: minuhin Date: Mon, 1 Feb 2021 17:04:39 +0300 Subject: [PATCH 41/82] update plantuml version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index f64e17a..88d2b24 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -39,7 +39,7 @@ foliantcontrib.multiproject >= 1.0.14 foliantcontrib.notifier >= 1.0.0 foliantcontrib.pandoc >= 1.1.0 foliantcontrib.pgsqldoc >= 1.1.6 -foliantcontrib.plantuml >= 1.0.7 +foliantcontrib.plantuml >= 1.0.8 # foliantcontrib.project_graph >= 1.0.1 foliantcontrib.ramldoc >= 1.0.1 foliantcontrib.reindexer >= 1.0.1 From 29574182f70cdc85e2605ca12a1c48f67d9e79a5 Mon Sep 17 00:00:00 2001 From: minuhin Date: Wed, 3 Feb 2021 17:40:22 +0300 Subject: [PATCH 42/82] update apilinks version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 88d2b24..c10b040 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -2,7 +2,7 @@ foliantcontrib.admonitions >= 1.0.0 foliantcontrib.aglio >= 1.0.0 foliantcontrib.alt_structure >= 0.2.0 foliantcontrib.anchors >= 1.0.5 -foliantcontrib.apilinks >= 1.2.3 +foliantcontrib.apilinks >= 1.2.4 foliantcontrib.archeme >= 1.0.3 foliantcontrib.badges >= 1.0.2 foliantcontrib.bindfigma >= 1.0.3 From 35401478cf10e65894909ded02c746cb26b5a470 Mon Sep 17 00:00:00 2001 From: minuhin Date: Thu, 18 Feb 2021 17:04:31 +0300 Subject: [PATCH 43/82] update confluence version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index c10b040..d55d68e 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -11,7 +11,7 @@ foliantcontrib.blockdiag >= 1.0.5 foliantcontrib.bump >= 1.0.2 foliantcontrib.csvtables >= 1.0.1 foliantcontrib.customids >= 1.0.7 -foliantcontrib.confluence >= 0.6.14 +foliantcontrib.confluence >= 0.6.16 foliantcontrib.dbmldoc >= 0.2.4 foliantcontrib.dbdoc >= 0.1.6 foliantcontrib.elasticsearch >= 1.0.4 From 71a9e8f7e507b9f65b0452895ca86c47adcf6a1c Mon Sep 17 00:00:00 2001 From: minuhin Date: Wed, 10 Mar 2021 10:59:33 +0300 Subject: [PATCH 44/82] update confluence version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index d55d68e..17bedb3 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -11,7 +11,7 @@ foliantcontrib.blockdiag >= 1.0.5 foliantcontrib.bump >= 1.0.2 foliantcontrib.csvtables >= 1.0.1 foliantcontrib.customids >= 1.0.7 -foliantcontrib.confluence >= 0.6.16 +foliantcontrib.confluence >= 0.6.17 foliantcontrib.dbmldoc >= 0.2.4 foliantcontrib.dbdoc >= 0.1.6 foliantcontrib.elasticsearch >= 1.0.4 From 76fa9bfa956e630fba4413e8efdc4e3880c1bfc8 Mon Sep 17 00:00:00 2001 From: minuhin Date: Thu, 11 Mar 2021 11:42:17 +0300 Subject: [PATCH 45/82] update versions apilinks, apireferences, header_anchors, add yaml_includes --- dependency_files/python_packages/requirements.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 17bedb3..499f4c1 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -2,7 +2,8 @@ foliantcontrib.admonitions >= 1.0.0 foliantcontrib.aglio >= 1.0.0 foliantcontrib.alt_structure >= 0.2.0 foliantcontrib.anchors >= 1.0.5 -foliantcontrib.apilinks >= 1.2.4 +foliantcontrib.apilinks >= 1.2.5 +foliantcontrib.apireferences >= 1.0.1 foliantcontrib.archeme >= 1.0.3 foliantcontrib.badges >= 1.0.2 foliantcontrib.bindfigma >= 1.0.3 @@ -55,10 +56,11 @@ foliantcontrib.swaggerdoc >= 1.2.3 foliantcontrib.templateparser >= 1.0.5 foliantcontrib.testcoverage >= 0.1.1 foliantcontrib.testrail >= 1.3.1 +foliantcontrib.yaml_include >= 1.0.0 foliantcontrib.utils >= 1.0.0 foliantcontrib.utils.chapters >= 1.0.4 foliantcontrib.utils.combined_options >= 1.0.10 -foliantcontrib.utils.header_anchors >= 1.0.3 +foliantcontrib.utils.header_anchors >= 1.0.4 foliantcontrib.utils.preprocessor_ext >= 1.0.5 archeme >= 1.0.2 From 3a2af844a0b3137a358916be52f895ef58a34e40 Mon Sep 17 00:00:00 2001 From: DDDsa Date: Thu, 1 Apr 2021 11:50:06 +0300 Subject: [PATCH 46/82] update confluence version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 499f4c1..e0ffaaf 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -12,7 +12,7 @@ foliantcontrib.blockdiag >= 1.0.5 foliantcontrib.bump >= 1.0.2 foliantcontrib.csvtables >= 1.0.1 foliantcontrib.customids >= 1.0.7 -foliantcontrib.confluence >= 0.6.17 +foliantcontrib.confluence >= 0.6.18 foliantcontrib.dbmldoc >= 0.2.4 foliantcontrib.dbdoc >= 0.1.6 foliantcontrib.elasticsearch >= 1.0.4 From 9f9774eeeb86efe96c297c331dde9ef3571f0a1e Mon Sep 17 00:00:00 2001 From: DDDsa Date: Tue, 20 Apr 2021 14:25:04 +0300 Subject: [PATCH 47/82] update anchors version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index e0ffaaf..2f17f71 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -1,7 +1,7 @@ foliantcontrib.admonitions >= 1.0.0 foliantcontrib.aglio >= 1.0.0 foliantcontrib.alt_structure >= 0.2.0 -foliantcontrib.anchors >= 1.0.5 +foliantcontrib.anchors >= 1.0.6 foliantcontrib.apilinks >= 1.2.5 foliantcontrib.apireferences >= 1.0.1 foliantcontrib.archeme >= 1.0.3 From 9195cc02ce03dc582fb972427c92126614936501 Mon Sep 17 00:00:00 2001 From: Vanderhoof Date: Tue, 4 May 2021 13:29:04 +0300 Subject: [PATCH 48/82] add downloadfile config extension to requirements --- dependency_files/python_packages/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 2f17f71..89801b2 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -15,6 +15,7 @@ foliantcontrib.customids >= 1.0.7 foliantcontrib.confluence >= 0.6.18 foliantcontrib.dbmldoc >= 0.2.4 foliantcontrib.dbdoc >= 0.1.6 +foliantcontrib.downloadfile >= 1.0.0 foliantcontrib.elasticsearch >= 1.0.4 foliantcontrib.epsconvert >= 1.0.7 foliantcontrib.escapecode >= 1.0.4 From 148fb8165269ecc0f73c7b17b38b472416d8a111 Mon Sep 17 00:00:00 2001 From: Vanderhoof Date: Fri, 7 May 2021 13:24:50 +0300 Subject: [PATCH 49/82] update versions: yaml_include, downloadfile, multiproject --- dependency_files/python_packages/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 89801b2..10b8d58 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -15,7 +15,7 @@ foliantcontrib.customids >= 1.0.7 foliantcontrib.confluence >= 0.6.18 foliantcontrib.dbmldoc >= 0.2.4 foliantcontrib.dbdoc >= 0.1.6 -foliantcontrib.downloadfile >= 1.0.0 +foliantcontrib.downloadfile >= 1.0.1 foliantcontrib.elasticsearch >= 1.0.4 foliantcontrib.epsconvert >= 1.0.7 foliantcontrib.escapecode >= 1.0.4 @@ -37,7 +37,7 @@ foliantcontrib.meta >= 1.3.2 foliantcontrib.metagraph >= 0.1.2 foliantcontrib.mkdocs >= 1.0.12 foliantcontrib.multilinetables >= 1.2.3 -foliantcontrib.multiproject >= 1.0.14 +foliantcontrib.multiproject >= 1.0.15 foliantcontrib.notifier >= 1.0.0 foliantcontrib.pandoc >= 1.1.0 foliantcontrib.pgsqldoc >= 1.1.6 @@ -57,7 +57,7 @@ foliantcontrib.swaggerdoc >= 1.2.3 foliantcontrib.templateparser >= 1.0.5 foliantcontrib.testcoverage >= 0.1.1 foliantcontrib.testrail >= 1.3.1 -foliantcontrib.yaml_include >= 1.0.0 +foliantcontrib.yaml_include >= 1.0.1 foliantcontrib.utils >= 1.0.0 foliantcontrib.utils.chapters >= 1.0.4 foliantcontrib.utils.combined_options >= 1.0.10 From 8af6333f6815116a98c1dc800a5d5247f88a578f Mon Sep 17 00:00:00 2001 From: Vanderhoof Date: Thu, 20 May 2021 19:55:22 +0300 Subject: [PATCH 50/82] update dbmldoc version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 10b8d58..ddaa71f 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -13,7 +13,7 @@ foliantcontrib.bump >= 1.0.2 foliantcontrib.csvtables >= 1.0.1 foliantcontrib.customids >= 1.0.7 foliantcontrib.confluence >= 0.6.18 -foliantcontrib.dbmldoc >= 0.2.4 +foliantcontrib.dbmldoc >= 0.3.0 foliantcontrib.dbdoc >= 0.1.6 foliantcontrib.downloadfile >= 1.0.1 foliantcontrib.elasticsearch >= 1.0.4 From 8f38f3885b02ffadfeccfc2dbe85433fa075d908 Mon Sep 17 00:00:00 2001 From: Vanderhoof Date: Tue, 6 Jul 2021 13:14:26 +0300 Subject: [PATCH 51/82] update plantuml version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index ddaa71f..fd939db 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -41,7 +41,7 @@ foliantcontrib.multiproject >= 1.0.15 foliantcontrib.notifier >= 1.0.0 foliantcontrib.pandoc >= 1.1.0 foliantcontrib.pgsqldoc >= 1.1.6 -foliantcontrib.plantuml >= 1.0.8 +foliantcontrib.plantuml >= 1.0.9 # foliantcontrib.project_graph >= 1.0.1 foliantcontrib.ramldoc >= 1.0.1 foliantcontrib.reindexer >= 1.0.1 From 98c8e7f280b6ac09c4687bb2287f1a2b002f7d13 Mon Sep 17 00:00:00 2001 From: Vanderhoof Date: Tue, 13 Jul 2021 13:02:52 +0300 Subject: [PATCH 52/82] update pydbml to 0.4.1 --- dependency_files/python_packages/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index fd939db..6d8b134 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -66,6 +66,7 @@ foliantcontrib.utils.preprocessor_ext >= 1.0.5 archeme >= 1.0.2 +pydbml >= 0.4.1 mkdocs-material == 4.6.3 pygments pymdown-extensions From e3994d004deef0b36ee61e16454f6b41df3c3420 Mon Sep 17 00:00:00 2001 From: minuhin Date: Wed, 21 Jul 2021 13:11:40 +0300 Subject: [PATCH 53/82] update utils and preprocessors versions --- .../python_packages/requirements.txt | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 6d8b134..0842ab4 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -1,9 +1,9 @@ -foliantcontrib.admonitions >= 1.0.0 +foliantcontrib.admonitions >= 1.0.1 foliantcontrib.aglio >= 1.0.0 -foliantcontrib.alt_structure >= 0.2.0 -foliantcontrib.anchors >= 1.0.6 +foliantcontrib.alt_structure >= 0.2.1 +foliantcontrib.anchors >= 1.0.7 foliantcontrib.apilinks >= 1.2.5 -foliantcontrib.apireferences >= 1.0.1 +foliantcontrib.apireferences >= 1.0.2 foliantcontrib.archeme >= 1.0.3 foliantcontrib.badges >= 1.0.2 foliantcontrib.bindfigma >= 1.0.3 @@ -12,9 +12,9 @@ foliantcontrib.blockdiag >= 1.0.5 foliantcontrib.bump >= 1.0.2 foliantcontrib.csvtables >= 1.0.1 foliantcontrib.customids >= 1.0.7 -foliantcontrib.confluence >= 0.6.18 -foliantcontrib.dbmldoc >= 0.3.0 -foliantcontrib.dbdoc >= 0.1.6 +foliantcontrib.confluence >= 0.6.19 +foliantcontrib.dbdoc >= 0.1.7 +foliantcontrib.dbmldoc >= 0.3.1 foliantcontrib.downloadfile >= 1.0.1 foliantcontrib.elasticsearch >= 1.0.4 foliantcontrib.epsconvert >= 1.0.7 @@ -22,7 +22,7 @@ foliantcontrib.escapecode >= 1.0.4 foliantcontrib.flags >= 1.0.2 foliantcontrib.flatten >= 1.0.7 foliantcontrib.glossary >= 1.0.0 -foliantcontrib.graphviz >= 1.1.4 +foliantcontrib.graphviz >= 1.1.5 foliantcontrib.gupload >= 1.1.5 foliantcontrib.history >= 1.0.8 foliantcontrib.imagemagick >= 1.0.2 @@ -32,18 +32,18 @@ foliantcontrib.includes >= 1.1.13 foliantcontrib.init >= 1.0.7 foliantcontrib.macros >= 1.0.4 foliantcontrib.mdtopdf >= 1.0.0 -foliantcontrib.mermaid >= 1.0.1 +foliantcontrib.mermaid >= 1.0.2 foliantcontrib.meta >= 1.3.2 -foliantcontrib.metagraph >= 0.1.2 +foliantcontrib.metagraph >= 0.1.3 foliantcontrib.mkdocs >= 1.0.12 foliantcontrib.multilinetables >= 1.2.3 foliantcontrib.multiproject >= 1.0.15 foliantcontrib.notifier >= 1.0.0 foliantcontrib.pandoc >= 1.1.0 foliantcontrib.pgsqldoc >= 1.1.6 -foliantcontrib.plantuml >= 1.0.9 +foliantcontrib.plantuml >= 1.0.10 # foliantcontrib.project_graph >= 1.0.1 -foliantcontrib.ramldoc >= 1.0.1 +foliantcontrib.ramldoc >= 1.0.2 foliantcontrib.reindexer >= 1.0.1 foliantcontrib.removeexcess >= 1.0.0 foliantcontrib.replace >= 1.0.5 @@ -52,17 +52,13 @@ foliantcontrib.showcommits >= 1.0.2 foliantcontrib.slate >= 1.0.8 foliantcontrib.slugs >= 1.0.1 foliantcontrib.subset >= 1.0.9 -foliantcontrib.superlinks >= 1.0.9 -foliantcontrib.swaggerdoc >= 1.2.3 -foliantcontrib.templateparser >= 1.0.5 +foliantcontrib.superlinks >= 1.0.10 +foliantcontrib.swaggerdoc >= 1.2.4 +foliantcontrib.templateparser >= 1.0.6 foliantcontrib.testcoverage >= 0.1.1 foliantcontrib.testrail >= 1.3.1 foliantcontrib.yaml_include >= 1.0.1 -foliantcontrib.utils >= 1.0.0 -foliantcontrib.utils.chapters >= 1.0.4 -foliantcontrib.utils.combined_options >= 1.0.10 -foliantcontrib.utils.header_anchors >= 1.0.4 -foliantcontrib.utils.preprocessor_ext >= 1.0.5 +foliantcontrib.utils >= 1.0.2 archeme >= 1.0.2 From 30f049c9ee533ec43ff5999d2977f4df03809b03 Mon Sep 17 00:00:00 2001 From: minuhin Date: Wed, 21 Jul 2021 15:12:08 +0300 Subject: [PATCH 54/82] update pandoc preprocessor version and meta version --- dependency_files/python_packages/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 0842ab4..d3f20d3 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -33,13 +33,13 @@ foliantcontrib.init >= 1.0.7 foliantcontrib.macros >= 1.0.4 foliantcontrib.mdtopdf >= 1.0.0 foliantcontrib.mermaid >= 1.0.2 -foliantcontrib.meta >= 1.3.2 +foliantcontrib.meta >= 1.3.3 foliantcontrib.metagraph >= 0.1.3 foliantcontrib.mkdocs >= 1.0.12 foliantcontrib.multilinetables >= 1.2.3 foliantcontrib.multiproject >= 1.0.15 foliantcontrib.notifier >= 1.0.0 -foliantcontrib.pandoc >= 1.1.0 +foliantcontrib.pandoc >= 1.1.1 foliantcontrib.pgsqldoc >= 1.1.6 foliantcontrib.plantuml >= 1.0.10 # foliantcontrib.project_graph >= 1.0.1 From 67d17be3df514b6dd40a3340cc693b62fe277ed6 Mon Sep 17 00:00:00 2001 From: minuhin Date: Thu, 22 Jul 2021 12:20:25 +0300 Subject: [PATCH 55/82] update csvtables version --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index d3f20d3..15bc1d0 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -10,7 +10,7 @@ foliantcontrib.bindfigma >= 1.0.3 foliantcontrib.bindsympli >= 1.0.13 foliantcontrib.blockdiag >= 1.0.5 foliantcontrib.bump >= 1.0.2 -foliantcontrib.csvtables >= 1.0.1 +foliantcontrib.csvtables >= 1.0.2 foliantcontrib.customids >= 1.0.7 foliantcontrib.confluence >= 0.6.19 foliantcontrib.dbdoc >= 0.1.7 From cbf278c552356d2132ff9ec42c2de67f811a2537 Mon Sep 17 00:00:00 2001 From: Vanderhoof Date: Mon, 2 Aug 2021 17:46:28 +0300 Subject: [PATCH 56/82] remove old utils from full docker image, add bpmn preprocessor to full docker image --- Dockerfile-full | 4 ++++ dependency_files/python_packages/requirements.txt | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Dockerfile-full b/Dockerfile-full index 693b629..73c9bae 100644 --- a/Dockerfile-full +++ b/Dockerfile-full @@ -19,6 +19,10 @@ RUN apt install -y nodejs RUN npm install puppeteer@5.2.1 +# Needed for BPMN preprocessor + +RUN npm install -g bpmn-to-image@0.5.1 --unsafe-perm + ####################### # Databases for DBDoc # ####################### diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 15bc1d0..aaa71cb 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -2,17 +2,18 @@ foliantcontrib.admonitions >= 1.0.1 foliantcontrib.aglio >= 1.0.0 foliantcontrib.alt_structure >= 0.2.1 foliantcontrib.anchors >= 1.0.7 -foliantcontrib.apilinks >= 1.2.5 +foliantcontrib.apilinks >= 1.2.6 foliantcontrib.apireferences >= 1.0.2 foliantcontrib.archeme >= 1.0.3 -foliantcontrib.badges >= 1.0.2 +foliantcontrib.badges >= 1.0.3 foliantcontrib.bindfigma >= 1.0.3 foliantcontrib.bindsympli >= 1.0.13 foliantcontrib.blockdiag >= 1.0.5 +foliantcontrib.bpmn >= 1.0.1 foliantcontrib.bump >= 1.0.2 +foliantcontrib.confluence >= 0.6.19 foliantcontrib.csvtables >= 1.0.2 foliantcontrib.customids >= 1.0.7 -foliantcontrib.confluence >= 0.6.19 foliantcontrib.dbdoc >= 0.1.7 foliantcontrib.dbmldoc >= 0.3.1 foliantcontrib.downloadfile >= 1.0.1 @@ -40,7 +41,7 @@ foliantcontrib.multilinetables >= 1.2.3 foliantcontrib.multiproject >= 1.0.15 foliantcontrib.notifier >= 1.0.0 foliantcontrib.pandoc >= 1.1.1 -foliantcontrib.pgsqldoc >= 1.1.6 +foliantcontrib.pgsqldoc >= 1.1.7 foliantcontrib.plantuml >= 1.0.10 # foliantcontrib.project_graph >= 1.0.1 foliantcontrib.ramldoc >= 1.0.2 @@ -58,7 +59,7 @@ foliantcontrib.templateparser >= 1.0.6 foliantcontrib.testcoverage >= 0.1.1 foliantcontrib.testrail >= 1.3.1 foliantcontrib.yaml_include >= 1.0.1 -foliantcontrib.utils >= 1.0.2 +foliantcontrib.utils >= 1.0.3 archeme >= 1.0.2 From 59421f32be62394f8dc2d036a769eef61264ff42 Mon Sep 17 00:00:00 2001 From: Vanderhoof Date: Tue, 17 Aug 2021 12:14:22 +0300 Subject: [PATCH 57/82] add argdown, update dbdoc --- Dockerfile-full | 5 +++++ dependency_files/python_packages/requirements.txt | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile-full b/Dockerfile-full index 73c9bae..bc03e2c 100644 --- a/Dockerfile-full +++ b/Dockerfile-full @@ -23,6 +23,11 @@ RUN npm install puppeteer@5.2.1 RUN npm install -g bpmn-to-image@0.5.1 --unsafe-perm +# Needed for Argdown preprocessor + +RUN npm install -g @argdown/cli +RUN npm install -g @argdown/image-export --unsafe-perm + ####################### # Databases for DBDoc # ####################### diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index aaa71cb..1ed8df0 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -5,6 +5,7 @@ foliantcontrib.anchors >= 1.0.7 foliantcontrib.apilinks >= 1.2.6 foliantcontrib.apireferences >= 1.0.2 foliantcontrib.archeme >= 1.0.3 +foliantcontrib.argdown >= 0.1.1 foliantcontrib.badges >= 1.0.3 foliantcontrib.bindfigma >= 1.0.3 foliantcontrib.bindsympli >= 1.0.13 @@ -14,7 +15,7 @@ foliantcontrib.bump >= 1.0.2 foliantcontrib.confluence >= 0.6.19 foliantcontrib.csvtables >= 1.0.2 foliantcontrib.customids >= 1.0.7 -foliantcontrib.dbdoc >= 0.1.7 +foliantcontrib.dbdoc >= 0.1.8 foliantcontrib.dbmldoc >= 0.3.1 foliantcontrib.downloadfile >= 1.0.1 foliantcontrib.elasticsearch >= 1.0.4 From 2cf1813f83782eb72e9eaae3a41104ea8f080a8c Mon Sep 17 00:00:00 2001 From: minuhin Date: Mon, 4 Oct 2021 10:47:12 +0300 Subject: [PATCH 58/82] update ca certs --- Dockerfile-full | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile-full b/Dockerfile-full index bc03e2c..9346aa3 100644 --- a/Dockerfile-full +++ b/Dockerfile-full @@ -2,6 +2,8 @@ FROM foliant/foliant:pandoc RUN apt update +RUN apt install --reinstall ca-certificates + COPY ./dependency_files/ /usr/src/app/dependency_files/ # Needed for ImageMagick From 23271e6ff98281fa9ef58c31ca7828875371bdfe Mon Sep 17 00:00:00 2001 From: Daniel Minukhin Date: Sun, 12 Dec 2021 17:56:13 +0300 Subject: [PATCH 59/82] update versions: confluence, replace, superlinks --- dependency_files/python_packages/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 1ed8df0..99d7a86 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -12,7 +12,7 @@ foliantcontrib.bindsympli >= 1.0.13 foliantcontrib.blockdiag >= 1.0.5 foliantcontrib.bpmn >= 1.0.1 foliantcontrib.bump >= 1.0.2 -foliantcontrib.confluence >= 0.6.19 +foliantcontrib.confluence >= 0.6.20 foliantcontrib.csvtables >= 1.0.2 foliantcontrib.customids >= 1.0.7 foliantcontrib.dbdoc >= 0.1.8 @@ -48,13 +48,13 @@ foliantcontrib.plantuml >= 1.0.10 foliantcontrib.ramldoc >= 1.0.2 foliantcontrib.reindexer >= 1.0.1 foliantcontrib.removeexcess >= 1.0.0 -foliantcontrib.replace >= 1.0.5 +foliantcontrib.replace >= 2.0.0 foliantcontrib.runcommands >= 1.0.1 foliantcontrib.showcommits >= 1.0.2 foliantcontrib.slate >= 1.0.8 foliantcontrib.slugs >= 1.0.1 foliantcontrib.subset >= 1.0.9 -foliantcontrib.superlinks >= 1.0.10 +foliantcontrib.superlinks >= 1.0.12 foliantcontrib.swaggerdoc >= 1.2.4 foliantcontrib.templateparser >= 1.0.6 foliantcontrib.testcoverage >= 0.1.1 From ccafa55be6ca0d32c69473bccf0797eff6a7f689 Mon Sep 17 00:00:00 2001 From: holamgadol Date: Thu, 5 May 2022 17:22:18 +0300 Subject: [PATCH 60/82] [packages] freeze mkdocs to version 1.2.3 --- dependency_files/python_packages/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 99d7a86..bce2915 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -65,6 +65,7 @@ foliantcontrib.utils >= 1.0.3 archeme >= 1.0.2 pydbml >= 0.4.1 +mkdocs == 1.2.3 mkdocs-material == 4.6.3 pygments pymdown-extensions From 74a42c7d3bdd3a9041f3e49586eb66a2c34ebc65 Mon Sep 17 00:00:00 2001 From: holamgadol Date: Thu, 5 May 2022 18:08:52 +0300 Subject: [PATCH 61/82] [packages] specify versions --- dependency_files/python_packages/requirements.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index bce2915..58e2cd2 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -67,10 +67,10 @@ archeme >= 1.0.2 pydbml >= 0.4.1 mkdocs == 1.2.3 mkdocs-material == 4.6.3 -pygments -pymdown-extensions +pygments == 2.6.1 +pymdown-extensions == 7.1 -lxml -Jinja2 -schema -PyYAML +lxml == 4.5.2 +Jinja2 == 2.11.2 +schema == 0.7.2 +PyYAML == 5.3.1 From 706b425d352fc284d3546baa9d755ec83e135fd2 Mon Sep 17 00:00:00 2001 From: holamgadol Date: Thu, 5 May 2022 18:12:34 +0300 Subject: [PATCH 62/82] [packages] specify python packages versions --- dependency_files/python_packages/requirements.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 58e2cd2..ac08dc7 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -65,12 +65,12 @@ foliantcontrib.utils >= 1.0.3 archeme >= 1.0.2 pydbml >= 0.4.1 -mkdocs == 1.2.3 +mkdocs == 1.1.2 mkdocs-material == 4.6.3 -pygments == 2.6.1 -pymdown-extensions == 7.1 +pygments == 2.12.0 +pymdown-extensions == 9.4 -lxml == 4.5.2 +lxml == 4.8.0 Jinja2 == 2.11.2 -schema == 0.7.2 +schema == 0.7.4 PyYAML == 5.3.1 From 83a839c3a09716a5ce3f476a0a22c99c5685862e Mon Sep 17 00:00:00 2001 From: holamgadol Date: Thu, 5 May 2022 18:14:10 +0300 Subject: [PATCH 63/82] [format] sort requirements.txt --- dependency_files/python_packages/requirements.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index ac08dc7..a1e183a 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -63,14 +63,12 @@ foliantcontrib.yaml_include >= 1.0.1 foliantcontrib.utils >= 1.0.3 archeme >= 1.0.2 - -pydbml >= 0.4.1 +Jinja2 == 2.11.2 +lxml == 4.8.0 mkdocs == 1.1.2 mkdocs-material == 4.6.3 +pydbml >= 0.4.1 pygments == 2.12.0 pymdown-extensions == 9.4 - -lxml == 4.8.0 -Jinja2 == 2.11.2 -schema == 0.7.4 PyYAML == 5.3.1 +schema == 0.7.4 From 608737abdd28fd6d5b880857d3f292ca23a43794 Mon Sep 17 00:00:00 2001 From: holamgadol Date: Thu, 5 May 2022 19:03:50 +0300 Subject: [PATCH 64/82] [packages] specify MarkupSafe --- dependency_files/python_packages/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index a1e183a..ece1074 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -65,6 +65,7 @@ foliantcontrib.utils >= 1.0.3 archeme >= 1.0.2 Jinja2 == 2.11.2 lxml == 4.8.0 +MarkupSafe == 2.0.1 mkdocs == 1.1.2 mkdocs-material == 4.6.3 pydbml >= 0.4.1 From 4c2ca14c02e5bb84be9924e90aea35b311487437 Mon Sep 17 00:00:00 2001 From: holamgadol Date: Fri, 6 May 2022 21:36:39 +0300 Subject: [PATCH 65/82] [packages] update to foliantcontrib.mkdocs == 1.0.13 --- dependency_files/python_packages/requirements.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index ece1074..5c88502 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -37,7 +37,7 @@ foliantcontrib.mdtopdf >= 1.0.0 foliantcontrib.mermaid >= 1.0.2 foliantcontrib.meta >= 1.3.3 foliantcontrib.metagraph >= 0.1.3 -foliantcontrib.mkdocs >= 1.0.12 +foliantcontrib.mkdocs >= 1.0.13 foliantcontrib.multilinetables >= 1.2.3 foliantcontrib.multiproject >= 1.0.15 foliantcontrib.notifier >= 1.0.0 @@ -63,12 +63,13 @@ foliantcontrib.yaml_include >= 1.0.1 foliantcontrib.utils >= 1.0.3 archeme >= 1.0.2 -Jinja2 == 2.11.2 +Jinja2 == 3.1.2 lxml == 4.8.0 MarkupSafe == 2.0.1 -mkdocs == 1.1.2 -mkdocs-material == 4.6.3 -pydbml >= 0.4.1 +mkdocs == 1.3.0 +mkdocs-material == 8.2.13 +mkdocs-material-extensions == 1.0.3 +pydbml == 0.4.2 pygments == 2.12.0 pymdown-extensions == 9.4 PyYAML == 5.3.1 From 0a5efbcd8a9b23fb8afa8efb5965a3d1bbf80749 Mon Sep 17 00:00:00 2001 From: holamgadol Date: Fri, 6 May 2022 21:44:34 +0300 Subject: [PATCH 66/82] [packages] Update PyYAML due to dependancy alert --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 5c88502..957d027 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -72,5 +72,5 @@ mkdocs-material-extensions == 1.0.3 pydbml == 0.4.2 pygments == 2.12.0 pymdown-extensions == 9.4 -PyYAML == 5.3.1 +PyYAML == 6.0 schema == 0.7.4 From 171ee192b2bc5742ffbfb248dccd1496c674e665 Mon Sep 17 00:00:00 2001 From: holamgadol Date: Fri, 6 May 2022 22:14:32 +0300 Subject: [PATCH 67/82] [packages] PyYAML to 5.4 due to incompability --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 957d027..46aa5d7 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -72,5 +72,5 @@ mkdocs-material-extensions == 1.0.3 pydbml == 0.4.2 pygments == 2.12.0 pymdown-extensions == 9.4 -PyYAML == 6.0 +PyYAML == 5.4 schema == 0.7.4 From 7dfded4c419b153efe3dd97013d63ae4d0a8f30c Mon Sep 17 00:00:00 2001 From: holamgadol Date: Thu, 12 May 2022 18:39:00 +0300 Subject: [PATCH 68/82] [packages] update foliantcontrib.imgcaptions to 1.0.3 and mkdocs-material to 8.2.14 --- dependency_files/python_packages/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 46aa5d7..d98ac2d 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -28,7 +28,7 @@ foliantcontrib.graphviz >= 1.1.5 foliantcontrib.gupload >= 1.1.5 foliantcontrib.history >= 1.0.8 foliantcontrib.imagemagick >= 1.0.2 -foliantcontrib.imgcaptions >= 1.0.2 +foliantcontrib.imgcaptions >= 1.0.3 foliantcontrib.imgconvert >= 1.0.0 foliantcontrib.includes >= 1.1.13 foliantcontrib.init >= 1.0.7 @@ -67,7 +67,7 @@ Jinja2 == 3.1.2 lxml == 4.8.0 MarkupSafe == 2.0.1 mkdocs == 1.3.0 -mkdocs-material == 8.2.13 +mkdocs-material == 8.2.14 mkdocs-material-extensions == 1.0.3 pydbml == 0.4.2 pygments == 2.12.0 From 625d747f5c3b7ae1951e297701dd42913ccdc558 Mon Sep 17 00:00:00 2001 From: holamgadol Date: Sat, 28 May 2022 22:26:35 +0300 Subject: [PATCH 69/82] [packages] add foliantcontrib.checksources --- dependency_files/python_packages/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index d98ac2d..b8dc77e 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -12,6 +12,7 @@ foliantcontrib.bindsympli >= 1.0.13 foliantcontrib.blockdiag >= 1.0.5 foliantcontrib.bpmn >= 1.0.1 foliantcontrib.bump >= 1.0.2 +foliantcontrib.checksources >= 1.0.0 foliantcontrib.confluence >= 0.6.20 foliantcontrib.csvtables >= 1.0.2 foliantcontrib.customids >= 1.0.7 @@ -44,7 +45,6 @@ foliantcontrib.notifier >= 1.0.0 foliantcontrib.pandoc >= 1.1.1 foliantcontrib.pgsqldoc >= 1.1.7 foliantcontrib.plantuml >= 1.0.10 -# foliantcontrib.project_graph >= 1.0.1 foliantcontrib.ramldoc >= 1.0.2 foliantcontrib.reindexer >= 1.0.1 foliantcontrib.removeexcess >= 1.0.0 @@ -59,8 +59,8 @@ foliantcontrib.swaggerdoc >= 1.2.4 foliantcontrib.templateparser >= 1.0.6 foliantcontrib.testcoverage >= 0.1.1 foliantcontrib.testrail >= 1.3.1 -foliantcontrib.yaml_include >= 1.0.1 foliantcontrib.utils >= 1.0.3 +foliantcontrib.yaml_include >= 1.0.1 archeme >= 1.0.2 Jinja2 == 3.1.2 From 39d6343a73e6c2596df1fa69a05add74ae63e0bf Mon Sep 17 00:00:00 2001 From: holamgadol Date: Thu, 9 Jun 2022 10:54:54 +0300 Subject: [PATCH 70/82] [packages] update foliantcontrib.apireferences to 1.0.3 --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index b8dc77e..3013da5 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -3,7 +3,7 @@ foliantcontrib.aglio >= 1.0.0 foliantcontrib.alt_structure >= 0.2.1 foliantcontrib.anchors >= 1.0.7 foliantcontrib.apilinks >= 1.2.6 -foliantcontrib.apireferences >= 1.0.2 +foliantcontrib.apireferences >= 1.0.3 foliantcontrib.archeme >= 1.0.3 foliantcontrib.argdown >= 0.1.1 foliantcontrib.badges >= 1.0.3 From d2a2acaa5d6539c09bb3366f7332c5642a194905 Mon Sep 17 00:00:00 2001 From: holamgadol Date: Wed, 15 Jun 2022 15:09:58 +0300 Subject: [PATCH 71/82] [packages] Update foliantcontrib.apireferences to 1.0.4 --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 3013da5..3ccd186 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -3,7 +3,7 @@ foliantcontrib.aglio >= 1.0.0 foliantcontrib.alt_structure >= 0.2.1 foliantcontrib.anchors >= 1.0.7 foliantcontrib.apilinks >= 1.2.6 -foliantcontrib.apireferences >= 1.0.3 +foliantcontrib.apireferences >= 1.0.4 foliantcontrib.archeme >= 1.0.3 foliantcontrib.argdown >= 0.1.1 foliantcontrib.badges >= 1.0.3 From 474c61f87fbe509e4ccfd5c08e699acf96a1e0a2 Mon Sep 17 00:00:00 2001 From: holamgadol Date: Wed, 22 Jun 2022 01:54:29 +0300 Subject: [PATCH 72/82] [update] change version source from develop to master branch --- build_full.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_full.sh b/build_full.sh index 2fc576b..08cea7b 100755 --- a/build_full.sh +++ b/build_full.sh @@ -9,7 +9,7 @@ else fi if [ ! $1 ] ; then - FOLIANT_VERSION=`curl https://raw.githubusercontent.com/foliant-docs/foliant/develop/foliant/__init__.py | grep -${grep_option}o "\d+\.\d+\.\d+"` + FOLIANT_VERSION=`curl https://raw.githubusercontent.com/foliant-docs/foliant/master/foliant/__init__.py | grep -${grep_option}o "\d+\.\d+\.\d+"` else FOLIANT_VERSION=$1 fi From 4c70ba91b6c8da2bdb53bf5c04e14585de20f889 Mon Sep 17 00:00:00 2001 From: holamgadol Date: Wed, 22 Jun 2022 13:22:07 +0300 Subject: [PATCH 73/82] [packages] update foliantcontrib.apireferences to 1.0.5 --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 3ccd186..bde3298 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -3,7 +3,7 @@ foliantcontrib.aglio >= 1.0.0 foliantcontrib.alt_structure >= 0.2.1 foliantcontrib.anchors >= 1.0.7 foliantcontrib.apilinks >= 1.2.6 -foliantcontrib.apireferences >= 1.0.4 +foliantcontrib.apireferences >= 1.0.5 foliantcontrib.archeme >= 1.0.3 foliantcontrib.argdown >= 0.1.1 foliantcontrib.badges >= 1.0.3 From 4cbb3b83eb1b9162a962ff33b59452ce550b3ef5 Mon Sep 17 00:00:00 2001 From: holamgadol Date: Mon, 27 Jun 2022 14:31:21 +0300 Subject: [PATCH 74/82] [packages] update foliantcontrib.showcommits to 1.0.3 --- dependency_files/python_packages/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index bde3298..3232a7d 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -50,7 +50,7 @@ foliantcontrib.reindexer >= 1.0.1 foliantcontrib.removeexcess >= 1.0.0 foliantcontrib.replace >= 2.0.0 foliantcontrib.runcommands >= 1.0.1 -foliantcontrib.showcommits >= 1.0.2 +foliantcontrib.showcommits >= 1.0.3 foliantcontrib.slate >= 1.0.8 foliantcontrib.slugs >= 1.0.1 foliantcontrib.subset >= 1.0.9 From ca70700ff037bdb43443b9b98cf9df125fa2e421 Mon Sep 17 00:00:00 2001 From: holamgadol Date: Mon, 15 Aug 2022 12:48:42 +0300 Subject: [PATCH 75/82] [packages] update foliant init and lxml --- dependency_files/python_packages/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index 3232a7d..e194283 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -32,7 +32,7 @@ foliantcontrib.imagemagick >= 1.0.2 foliantcontrib.imgcaptions >= 1.0.3 foliantcontrib.imgconvert >= 1.0.0 foliantcontrib.includes >= 1.1.13 -foliantcontrib.init >= 1.0.7 +foliantcontrib.init >= 1.0.9 foliantcontrib.macros >= 1.0.4 foliantcontrib.mdtopdf >= 1.0.0 foliantcontrib.mermaid >= 1.0.2 @@ -64,7 +64,7 @@ foliantcontrib.yaml_include >= 1.0.1 archeme >= 1.0.2 Jinja2 == 3.1.2 -lxml == 4.8.0 +lxml == 4.9.1 MarkupSafe == 2.0.1 mkdocs == 1.3.0 mkdocs-material == 8.2.14 From 27dfc024bdc8b8254fa790f3751743c53743cbf6 Mon Sep 17 00:00:00 2001 From: holamgadol Date: Mon, 15 Aug 2022 14:50:06 +0300 Subject: [PATCH 76/82] add buils scripts for slim, latest and pandoc images --- build_latest.sh | 10 ++++++++++ build_pandoc.sh | 24 ++++++++++++++++++++++++ build_slim.sh | 24 ++++++++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100755 build_latest.sh create mode 100755 build_pandoc.sh create mode 100755 build_slim.sh diff --git a/build_latest.sh b/build_latest.sh new file mode 100755 index 0000000..cad4c67 --- /dev/null +++ b/build_latest.sh @@ -0,0 +1,10 @@ +#!/bin/bash -e + + +echo "Building and pushing the latest image" + +docker pull foliant/foliant:slim +docker login +docker build --no-cache -t foliant/foliant ./ 2>&1 | tee ./build.log +docker push foliant/foliant +docker logout diff --git a/build_pandoc.sh b/build_pandoc.sh new file mode 100755 index 0000000..6a3fce6 --- /dev/null +++ b/build_pandoc.sh @@ -0,0 +1,24 @@ +#!/bin/bash -e + +os_type=`uname` + +if [ "${os_type}" == 'Darwin' ] ; then + grep_option='E' +else + grep_option='P' +fi + +if [ ! $1 ] ; then + FOLIANT_VERSION=`curl https://raw.githubusercontent.com/foliant-docs/foliant/master/foliant/__init__.py | grep -${grep_option}o "\d+\.\d+\.\d+"` +else + FOLIANT_VERSION=$1 +fi + +echo "Building and pushing the pandoc image for Foliant ${FOLIANT_VERSION}" + +docker pull foliant/foliant +docker login +docker build --no-cache -t foliant/foliant:pandoc -t foliant/foliant:${FOLIANT_VERSION}-pandoc -f Dockerfile-pandoc ./ 2>&1 | tee ./build.log +docker push foliant/foliant:pandoc +docker push foliant/foliant:${FOLIANT_VERSION}-pandoc +docker logout diff --git a/build_slim.sh b/build_slim.sh new file mode 100755 index 0000000..f8d8885 --- /dev/null +++ b/build_slim.sh @@ -0,0 +1,24 @@ +#!/bin/bash -e + +os_type=`uname` + +if [ "${os_type}" == 'Darwin' ] ; then + grep_option='E' +else + grep_option='P' +fi + +if [ ! $1 ] ; then + FOLIANT_VERSION=`curl https://raw.githubusercontent.com/foliant-docs/foliant/master/foliant/__init__.py | grep -${grep_option}o "\d+\.\d+\.\d+"` +else + FOLIANT_VERSION=$1 +fi + +echo "Building and pushing the slim image for Foliant ${FOLIANT_VERSION}" + +docker pull ubuntu:focal +docker login +docker build --no-cache --build-arg VERSION=${FOLIANT_VERSION} -t foliant/foliant:slim -t foliant/foliant:${FOLIANT_VERSION}-slim -f Dockerfile-slim ./ 2>&1 | tee ./build.log +docker push foliant/foliant:slim +docker push foliant/foliant:${FOLIANT_VERSION}-slim +docker logout From 6a4d4d0835c3f7882d26af0fc82f95eaa27cf2c0 Mon Sep 17 00:00:00 2001 From: Anton Kopylov Date: Tue, 30 Aug 2022 15:54:57 +0500 Subject: [PATCH 77/82] Added README file for foliant-docs/docker --- README.md | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..0f52306 --- /dev/null +++ b/README.md @@ -0,0 +1,84 @@ +# Content + +This repo contains: + +1. Four Dockerfiles to build docker images: + * Dockerfile-slim — minimal image of Foliant with no extensions + * Dockerfile — the basic image with just Foliant core and the `init` command + * Dockerfile-pandoc — basic image with the addition of TexLive and Pandoc for building PDF and DOCX + * Dockerfile-full — the full image with all official Foliant extensions and third-party tools required for them to work + + +2. Each Dockerfile has it's own build-and-publish script to [Docker Hub:](https://hub.docker.com/r/foliant/foliant/tags) + * build_slim.sh + * build_latest.sh + * build_pandoc.sh + * build_full.sh + + +3. Makefile to build and test Foliant on local computer + + +4. dependency_files contains: + * imagemagick + * python_packages with requirements.txt (contains all packages for Foliant) + +# Dockerfile dependencies + +Docker images builds based on previous light version in the following order: +> Dockerfile-slim → Dockerfile → Dockerfile-pandoc → Dockerfile-full + +It means that if you update Dockerfile-slim, you should update all its dependants after: +Dockerfile then Dockerfile-pandoc then Dockerfile-full. If you want to update Dockerfile, +you should update Dockerfile-pandoc then Dockerfile-full etc. + +## Which image to update? + +* When [Foliant-core]((https://github.com/foliant-docs/foliant)) updates: + > update Dockerfile-slim → Dockerfile → Dockerfile-pandoc → Dockerfile-full + +* When [foliantcontrib.init](https://github.com/foliant-docs/foliantcontrib.init) updates: + > update Dockerfile → Dockerfile-pandoc → Dockerfile-full + +* When [foliantcontrib.pandoc](https://github.com/foliant-docs/foliantcontrib.pandoc) updates: + > update Dockerfile-pandoc → Dockerfile-full + +* When any other Foliant extension updates: + > update Dockerfile-full and [requirements.txt](https://github.com/foliant-docs/docker/blob/master/dependency_files/python_packages/requirements.txt) + > from `dependency_files/python_packages/requirements.txt` + +# Update procedure +To update Docker-image on Docker Hub you should: +1. Clone, pull or download this repo on your computer. +2. Update Docker-images you need. +3. Push changes to this repo. +4. Run script which related to Docker-image you updated: +```bash +# In the project directory + +sh build_slim.sh # for Dockerfile-slim +sh build_latest.sh # for Dockerfile +sh build_pandoc.sh # for Dockerfile-pandoc +sh build_full.sh # for Dockerfile-full +``` + +### How to tag image (optional) +If you want to tag image, write its title after script: +```bash +sh build_full.sh 1.0.13 +``` + +### Docker Hub authorization +To push images to [Foliant project on Docker Hub](https://hub.docker.com/r/foliant/foliant/), +you should be logged in as **foliantshared** + +## Project links +[Foliant-core repo](https://github.com/foliant-docs/foliant) + +[Docker Hub repo with Foliant images](https://hub.docker.com/r/foliant/foliant) + +[Foliant Documentation website](https://foliant-docs.github.io/docs/) + +[foliantcontrib.init](https://github.com/foliant-docs/foliantcontrib.init) + +[foliantcontrib.pandoc](https://github.com/foliant-docs/foliantcontrib.pandoc) \ No newline at end of file From 6bb1f60e84dd9ddedadeaab544e05e79216d45ca Mon Sep 17 00:00:00 2001 From: Anton Kopylov Date: Wed, 31 Aug 2022 12:54:01 +0500 Subject: [PATCH 78/82] Add README.md for Docker project --- README.md | 106 +++++++++++++++++++++++++----------------------------- 1 file changed, 48 insertions(+), 58 deletions(-) diff --git a/README.md b/README.md index 0f52306..fe2ec3a 100644 --- a/README.md +++ b/README.md @@ -1,84 +1,74 @@ -# Content - -This repo contains: - -1. Four Dockerfiles to build docker images: - * Dockerfile-slim — minimal image of Foliant with no extensions - * Dockerfile — the basic image with just Foliant core and the `init` command - * Dockerfile-pandoc — basic image with the addition of TexLive and Pandoc for building PDF and DOCX - * Dockerfile-full — the full image with all official Foliant extensions and third-party tools required for them to work - - -2. Each Dockerfile has it's own build-and-publish script to [Docker Hub:](https://hub.docker.com/r/foliant/foliant/tags) - * build_slim.sh - * build_latest.sh - * build_pandoc.sh - * build_full.sh - - -3. Makefile to build and test Foliant on local computer - - -4. dependency_files contains: - * imagemagick - * python_packages with requirements.txt (contains all packages for Foliant) - -# Dockerfile dependencies - -Docker images builds based on previous light version in the following order: +# Docker +Docker is a project that helps develop, update and publish Docker images for Foliant. + +## Overview +There are four Docker images to build different versions of Foliant. +This repo contains Dockerfiles to build each Docker image. +Also, each Dockerfile has its own build-and-publish script to publish images to [Docker Hub](https://hub.docker.com/r/foliant/foliant/tags). + +* `foliant/foliant:slim` — minimal image of Foliant core with no extensions. + * [Dockerfile-slim](https://github.com/foliant-docs/docker/blob/master/Dockerfile-slim) + * [build_slim.sh](https://github.com/foliant-docs/docker/blob/master/build_slim.sh) + +* `foliant/foliant` — the default image with Foliant core and the `init` extension + * [Dockerfile](https://github.com/foliant-docs/docker/blob/master/Dockerfile) + * [build_latest.sh](https://github.com/foliant-docs/docker/blob/master/build_latest.sh) +* `foliant/foliant:pandoc` — the default image with foliantcontrib.pandoc and its dependencies: +TexLive and Pandoc for building PDF and DOCX + * [Dockerfile-pandoc](https://github.com/foliant-docs/docker/blob/master/Dockerfile-pandoc) + * [build_pandoc.sh](https://github.com/foliant-docs/docker/blob/master/build_pandoc.sh) +* `foliant/foliant:full` — the full image with all official Foliant extensions and third-party tools required for them to work + * [Dockerfile-full](https://github.com/foliant-docs/docker/blob/master/Dockerfile-full) + * [build_full.sh](https://github.com/foliant-docs/docker/blob/master/build_full.sh) + +* [Makefile](https://github.com/foliant-docs/docker/blob/master/Makefile) needed to build Docker images on local computer + +## Docker images dependencies + +Docker images builds with Dockerfiles based on previous light version in the following order: > Dockerfile-slim → Dockerfile → Dockerfile-pandoc → Dockerfile-full -It means that if you update Dockerfile-slim, you should update all its dependants after: -Dockerfile then Dockerfile-pandoc then Dockerfile-full. If you want to update Dockerfile, -you should update Dockerfile-pandoc then Dockerfile-full etc. +It means that if you update `foliant/foliant:slim`, you should update all its dependants after: +`foliant/foliant` then `foliant/foliant:pandoc` then `foliant/foliant:full`. If you want to update `foliant/foliant`, +you should update `foliant/foliant:pandoc` then `foliant/foliant:full` etc. -## Which image to update? +### Which image to update? * When [Foliant-core]((https://github.com/foliant-docs/foliant)) updates: - > update Dockerfile-slim → Dockerfile → Dockerfile-pandoc → Dockerfile-full + > update `foliant/foliant:slim` → `foliant/foliant` → `foliant/foliant:pandoc` → `foliant/foliant:full` * When [foliantcontrib.init](https://github.com/foliant-docs/foliantcontrib.init) updates: - > update Dockerfile → Dockerfile-pandoc → Dockerfile-full + > update `foliant/foliant` → `foliant/foliant:pandoc` → `foliant/foliant:full` * When [foliantcontrib.pandoc](https://github.com/foliant-docs/foliantcontrib.pandoc) updates: - > update Dockerfile-pandoc → Dockerfile-full + > update `foliant/foliant:pandoc` → `foliant/foliant:full` * When any other Foliant extension updates: - > update Dockerfile-full and [requirements.txt](https://github.com/foliant-docs/docker/blob/master/dependency_files/python_packages/requirements.txt) + > update `foliant/foliant:full` and [requirements.txt](https://github.com/foliant-docs/docker/blob/master/dependency_files/python_packages/requirements.txt) > from `dependency_files/python_packages/requirements.txt` -# Update procedure +## Update procedure To update Docker-image on Docker Hub you should: 1. Clone, pull or download this repo on your computer. -2. Update Docker-images you need. +2. Update dependencies if needed. 3. Push changes to this repo. -4. Run script which related to Docker-image you updated: +4. Run script which related to Docker-image you needed: + ```bash # In the project directory -sh build_slim.sh # for Dockerfile-slim -sh build_latest.sh # for Dockerfile -sh build_pandoc.sh # for Dockerfile-pandoc -sh build_full.sh # for Dockerfile-full +./build_slim.sh # for foliant/foliant:slim +./build_latest.sh # for foliant/foliant +./build_pandoc.sh # for foliant/foliant:pandoc +./build_full.sh # for foliant/foliant:full ``` -### How to tag image (optional) -If you want to tag image, write its title after script: +#### How to tag image (optional) +Scripts set tag for published image automatically. But you can tag the image manually as script parameter: ```bash -sh build_full.sh 1.0.13 +./build_full.sh 1.0.13 ``` -### Docker Hub authorization +#### Docker Hub authorization To push images to [Foliant project on Docker Hub](https://hub.docker.com/r/foliant/foliant/), you should be logged in as **foliantshared** - -## Project links -[Foliant-core repo](https://github.com/foliant-docs/foliant) - -[Docker Hub repo with Foliant images](https://hub.docker.com/r/foliant/foliant) - -[Foliant Documentation website](https://foliant-docs.github.io/docs/) - -[foliantcontrib.init](https://github.com/foliant-docs/foliantcontrib.init) - -[foliantcontrib.pandoc](https://github.com/foliant-docs/foliantcontrib.pandoc) \ No newline at end of file From 88ba7418032a7b3a7263c2a014767b7fbef8e16d Mon Sep 17 00:00:00 2001 From: Anton Kopylov Date: Wed, 31 Aug 2022 15:09:41 +0500 Subject: [PATCH 79/82] Add README.md for Docker project --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fe2ec3a..c50fec6 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,9 @@ Docker is a project that helps develop, update and publish Docker images for Fol ## Overview There are four Docker images to build different versions of Foliant. This repo contains Dockerfiles to build each Docker image. -Also, each Dockerfile has its own build-and-publish script to publish images to [Docker Hub](https://hub.docker.com/r/foliant/foliant/tags). +Also, +each Dockerfile has its own build-and-publish script +to publish images to [Docker Hub](https://hub.docker.com/r/foliant/foliant/tags). * `foliant/foliant:slim` — minimal image of Foliant core with no extensions. * [Dockerfile-slim](https://github.com/foliant-docs/docker/blob/master/Dockerfile-slim) @@ -25,7 +27,7 @@ TexLive and Pandoc for building PDF and DOCX ## Docker images dependencies -Docker images builds with Dockerfiles based on previous light version in the following order: +Docker images build with Dockerfiles based on a previous light version in the following order: > Dockerfile-slim → Dockerfile → Dockerfile-pandoc → Dockerfile-full It means that if you update `foliant/foliant:slim`, you should update all its dependants after: @@ -48,11 +50,11 @@ you should update `foliant/foliant:pandoc` then `foliant/foliant:full` etc. > from `dependency_files/python_packages/requirements.txt` ## Update procedure -To update Docker-image on Docker Hub you should: +To update Docker-image on Docker Hub, you should: 1. Clone, pull or download this repo on your computer. 2. Update dependencies if needed. 3. Push changes to this repo. -4. Run script which related to Docker-image you needed: +4. Run a script which related to Docker-image you needed: ```bash # In the project directory @@ -70,5 +72,5 @@ Scripts set tag for published image automatically. But you can tag the image man ``` #### Docker Hub authorization -To push images to [Foliant project on Docker Hub](https://hub.docker.com/r/foliant/foliant/), +To push images to the [Foliant project on Docker Hub](https://hub.docker.com/r/foliant/foliant/), you should be logged in as **foliantshared** From e9873721006d02e8e4ec9b3d78d44023a434e0ff Mon Sep 17 00:00:00 2001 From: Anton Kopylov Date: Wed, 31 Aug 2022 15:13:16 +0500 Subject: [PATCH 80/82] Add README.md for Docker project --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c50fec6..5e8178f 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ To update Docker-image on Docker Hub, you should: ``` #### How to tag image (optional) -Scripts set tag for published image automatically. But you can tag the image manually as script parameter: +Scripts set tag for published image automatically. But you can tag the image manually as a script parameter: ```bash ./build_full.sh 1.0.13 ``` From 8e1fa5a67526694b728332103660c1ac8b477d53 Mon Sep 17 00:00:00 2001 From: Anton Kopylov Date: Wed, 31 Aug 2022 15:55:46 +0500 Subject: [PATCH 81/82] Add README.md for Docker project --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5e8178f..a67b1c6 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,10 @@ to publish images to [Docker Hub](https://hub.docker.com/r/foliant/foliant/tags) * [Dockerfile-slim](https://github.com/foliant-docs/docker/blob/master/Dockerfile-slim) * [build_slim.sh](https://github.com/foliant-docs/docker/blob/master/build_slim.sh) -* `foliant/foliant` — the default image with Foliant core and the `init` extension +* `foliant/foliant` — the default image with Foliant core and the foliantcontrib.init extension * [Dockerfile](https://github.com/foliant-docs/docker/blob/master/Dockerfile) * [build_latest.sh](https://github.com/foliant-docs/docker/blob/master/build_latest.sh) -* `foliant/foliant:pandoc` — the default image with foliantcontrib.pandoc and its dependencies: +* `foliant/foliant:pandoc` — the image with foliantcontrib.pandoc and its dependencies: TexLive and Pandoc for building PDF and DOCX * [Dockerfile-pandoc](https://github.com/foliant-docs/docker/blob/master/Dockerfile-pandoc) * [build_pandoc.sh](https://github.com/foliant-docs/docker/blob/master/build_pandoc.sh) @@ -36,7 +36,7 @@ you should update `foliant/foliant:pandoc` then `foliant/foliant:full` etc. ### Which image to update? -* When [Foliant-core]((https://github.com/foliant-docs/foliant)) updates: +* When [Foliant-core](https://github.com/foliant-docs/foliant) updates: > update `foliant/foliant:slim` → `foliant/foliant` → `foliant/foliant:pandoc` → `foliant/foliant:full` * When [foliantcontrib.init](https://github.com/foliant-docs/foliantcontrib.init) updates: @@ -72,5 +72,5 @@ Scripts set tag for published image automatically. But you can tag the image man ``` #### Docker Hub authorization -To push images to the [Foliant project on Docker Hub](https://hub.docker.com/r/foliant/foliant/), -you should be logged in as **foliantshared** +To push images to the [Foliant project on Docker Hub](https://hub.docker.com/r/foliant/foliant/), +you need an account on Docker Hub with appropriate rights. From 97917c72d343979cbc6df7728b817eb730e56b78 Mon Sep 17 00:00:00 2001 From: Anton Kopylov Date: Sun, 11 Sep 2022 16:01:51 +0500 Subject: [PATCH 82/82] Add header --- .gitignore | 1 + README.md | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index cc90009..605749a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /build.log +.idea \ No newline at end of file diff --git a/README.md b/README.md index a67b1c6..abd96a4 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ Also, each Dockerfile has its own build-and-publish script to publish images to [Docker Hub](https://hub.docker.com/r/foliant/foliant/tags). +## header + * `foliant/foliant:slim` — minimal image of Foliant core with no extensions. * [Dockerfile-slim](https://github.com/foliant-docs/docker/blob/master/Dockerfile-slim) * [build_slim.sh](https://github.com/foliant-docs/docker/blob/master/build_slim.sh)