Добавлен образ для сборки документации.

.gitattributes

@@ -0,0 +1 @@
+*.deb filter=lfs diff=lfs merge=lfs -text

.gitea/workflows/release.yaml

@@ -78,6 +78,27 @@ jobs:
             git.mousesoft.ru/ms/gitea-runner-images:python-ubuntu-22.04-${{ steps.meta.outputs.IMAGE_VERSION }}
             git.mousesoft.ru/ms/gitea-runner-images:python-ubuntu-latest
 
+      - name: build and push doc 22.04
+        uses: https://git.mousesoft.ru/ms/gitea-action-docker-build-push@v6
+        with:
+          context: .
+          file: dockerfiles/doc.dockerfile
+          platforms: |
+            linux/amd64
+            linux/arm64
+          pull: true
+          push: true
+          no-cache: true
+          build-args: |
+            BASE_IMAGE_TAG=ubuntu-22.04
+            IMAGE_VERSION=${{ steps.meta.outputs.IMAGE_VERSION }}
+            IMAGE_CREATED=${{ steps.meta.outputs.IMAGE_CREATED }}
+            IMAGE_REVISION=${{ steps.meta.outputs.IMAGE_REVISION }}
+          tags: |
+            git.mousesoft.ru/ms/gitea-runner-images:doc-ubuntu-22.04
+            git.mousesoft.ru/ms/gitea-runner-images:doc-ubuntu-22.04-${{ steps.meta.outputs.IMAGE_VERSION }}
+            git.mousesoft.ru/ms/gitea-runner-images:doc-ubuntu-latest
+
       - name: build and push base 20.04
         uses: https://git.mousesoft.ru/ms/gitea-action-docker-build-push@v6
         with:
@@ -117,3 +138,23 @@ jobs:
           tags: |
             git.mousesoft.ru/ms/gitea-runner-images:python-ubuntu-20.04
             git.mousesoft.ru/ms/gitea-runner-images:python-ubuntu-20.04-${{ steps.meta.outputs.IMAGE_VERSION }}
+
+      - name: build and push doc 20.04
+        uses: https://git.mousesoft.ru/ms/gitea-action-docker-build-push@v6
+        with:
+          context: .
+          file: dockerfiles/doc.dockerfile
+          platforms: |
+            linux/amd64
+            linux/arm64
+          pull: true
+          push: true
+          no-cache: true
+          build-args: |
+            BASE_IMAGE_TAG=ubuntu-20.04
+            IMAGE_VERSION=${{ steps.meta.outputs.IMAGE_VERSION }}
+            IMAGE_CREATED=${{ steps.meta.outputs.IMAGE_CREATED }}
+            IMAGE_REVISION=${{ steps.meta.outputs.IMAGE_REVISION }}
+          tags: |
+            git.mousesoft.ru/ms/gitea-runner-images:doc-ubuntu-20.04
+            git.mousesoft.ru/ms/gitea-runner-images:doc-ubuntu-20.04-${{ steps.meta.outputs.IMAGE_VERSION }}

dist/mousesoft-debian.key

@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFxahGQBCADipjqsJswzONYtu0OuBud8xUd3hOvZVNNlJ5FjtAhftgDZ7nen
+ljYvZaO3hLKvMllpTf24JnA+ArJeH2yUw8oc6jxBmHbx6AT5qWGWaFFnoHwULcus
+2BBHek7a5kfOEi0S1ayOkXo3pe3TMMMqTl9/ILca8ze2UW+YntOXy2a0vgPrkv6w
+r9/NjyfWjsPHGCbinMAuHSf8PKxMOxyjribxo1FHn4fo+KioK9xNzWSzLU90QxbM
+mYP6i3NI9atv/bxhxIi5mRHrzj9yf8jglp+AvB3fMhhqUvWeMYJvnll8SsUcQC7c
+Q46Ha9sLuzqPEXs1mZS4eMdi4dUBHd+eJSFnABEBAAG0JU1vdXNlU29mdCBEZWJp
+YW4gPGFkbWluQG1vdXNlc29mdC5tbD6JATcEEwEIACEFAlxahGQCGwMFCwkIBwIG
+FQgJCgsCBBYCAwECHgECF4AACgkQfq1MsJ62aaF0eQf/QUDuWeVWNRd/+wuHd9P5
+w07NDcamHyfQ8PUlDjcpwqfEZx+QabohlGqEgKllcfKkg1jQs3s80q9JgEkqqok5
+k+24FjG9kBt9lMqp2V7Rhign1kIEB/H0zxd1IO8s/CPHgdtZ2CF1Gow0JZzGBIn/
+myO3C804AF0r0npDqkOooBzX29q2ArnhmCDaleq84i2IY6489wevcZsd+5uIQ3k0
+eDApWfZWMonnZ3eg2KaSxOA7RaeAHuOZKYBe29PCTdvuDbLEaRRBmDJbPYqDQTGS
+VTH88HaHgGyHMMtyCBFTFCOC0WQ1pvjQJJW5Iy9NwVTcmfx+2Vwy+dkHWt062C53
+CbkBDQRcWoRkAQgAypWSX3loLEQyZhtupNUgXjEiO6bnn1OdfqfnIxD5z15vba77
+B9FwuFcC+dx1Il0drPa3tgl5BqGLQKdSA3FZqc41Rp9L/81MP/NCm1AL4BeO1x46
+FJe1+YZqEip2CZqNdP5y5cVQoz8cGtwpDDIDGwAxmXnHmYjcXI+nx+mzufnDUKXB
+jVtMFFBh0vFFpbEr6a9ue4gyhtNSxbPYVJ/iOyVwNz+OXnqRHKn4VF0l1zfr3SVi
+PVBlg87IODaI+DwGjWuaVXCqXKYMh9JwvHu4sdcTYkeFh4FLGEcdFcpEX0+zJDpd
+mIDozaC7jHnIfKep8791r7UWvvvV+b2DPe9zGQARAQABiQEfBBgBCAAJBQJcWoRk
+AhsMAAoJEH6tTLCetmmhWS4H/AtebP6OQoFDrgH38T94+izzVw8TiZ/fu/YgM35x
+lbpFgAufrd1VVwaxQRpw74CCm6jIVBc2ZWyebvKXw89ffYcEC/eilStCuh2M2FKS
+DlrrGIUPM18jhljZK4x82stMAyufxLVLEwdO5nJjLgdBNgxE8hHzZTeb7j/hIReE
+iFNCVUHYrE7DIhy3T7i94j0pjycc7b7fHVdYFEjEr39h8Cz2D6I2cZGw+ePilJMy
+tx+QM7OV85mphzhWrM4zl96RY9ygIFZUMmrB6P4DVJcqVtD50dYEdculmw84pYRe
+hbmaq5qk6YYWQPV0oZPrEVf+2dc0yNqfuB8gyirI5r1hR5A=
+=oXJU
+-----END PGP PUBLIC KEY BLOCK-----

dockerfiles/base.dockerfile

@@ -18,13 +18,7 @@ LABEL org.opencontainers.image.created="${IMAGE_CREATED}" \
     org.opencontainers.image.title="MouseSoft Gitea Actions runner images" \
     org.opencontainers.image.description="MouseSoft docker images used by act_runner to run workflows."
 
-ENV LANG=ru_RU.UTF-8
-
 RUN apt-get update && \
     apt-get install -y build-essential debhelper dh-exec dpkg-dev dput-ng \
     fakeroot gawk locales sed && \
     rm -rf /var/lib/apt/lists/*
-
-COPY --chown=root:root etc /etc
-
-RUN locale-gen --lang ru

dockerfiles/doc.dockerfile

@@ -0,0 +1,41 @@
+ARG BASE_IMAGE_TAG
+
+FROM ghcr.io/catthehacker/ubuntu:${BASE_IMAGE_TAG}
+
+ARG IMAGE_CREATED
+ARG IMAGE_VERSION
+ARG IMAGE_REVISION
+
+LABEL org.opencontainers.image.created="${IMAGE_CREATED}" \
+    org.opencontainers.image.authors="MouseSoft" \
+    org.opencontainers.image.url="https://git.mousesoft.ru/ms/gitea-runner-images" \
+    org.opencontainers.image.documentation="https://git.mousesoft.ru/ms/gitea-runner-images/src/branch/main/README.md" \
+    org.opencontainers.image.source="https://git.mousesoft.ru/ms/gitea-runner-images" \
+    org.opencontainers.image.version="${IMAGE_VERSION}" \
+    org.opencontainers.image.revision="${IMAGE_REVISION}" \
+    org.opencontainers.image.vendor="MouseSoft" \
+    org.opencontainers.image.licenses="MIT" \
+    org.opencontainers.image.title="MouseSoft Gitea Actions runner images" \
+    org.opencontainers.image.description="MouseSoft docker images used by act_runner to run workflows."
+
+ENV LANG=ru_RU.UTF-8
+
+COPY dist/drawio-amd64-24.1.0.deb /tmp/drawio.deb
+COPY dist/mousesoft-debian.key /tmp/
+
+RUN apt-get update && \
+    apt-get install -y gnupg2 && \
+    apt-key add /tmp/mousesoft-debian.key && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY etc /etc
+
+RUN apt-get update && \
+    apt-get install -y asciidoctor curl graphviz libgbm1 libgtk-3-0 libnotify4 \
+    libsecret-1-0 libxss1 locales make plantuml rubygems xdg-utils xvfb xz-utils && \
+    gem install asciidoctor-diagram && \
+    gem install asciidoctor-pdf && \
+    gem install rouge && \
+    dpkg -i /tmp/drawio.deb && rm -f /tmp/drawio.deb && \
+    locale-gen --lang ru && \
+    rm -rf /var/lib/apt/lists/*

etc/apt/sources.list.d/mousesoft.list

@@ -0,0 +1,3 @@
+# MouseSoft
+deb https://mousesoft.ru/debian/ mousesoft-stable/
+deb-src https://mousesoft.ru/debian/ mousesoft-stable/