From 2bb6bf9878c3f2ecb0a9111a16cd650bd21c2987 Mon Sep 17 00:00:00 2001 From: Thomas Kolb Date: Tue, 27 Aug 2024 20:01:54 +0200 Subject: [PATCH] Add rsync to documentation CI container --- .forgejo/workflows/doc.yaml | 6 +++--- doc/docker/Dockerfile | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/doc.yaml b/.forgejo/workflows/doc.yaml index e13c7cf..a1c0c29 100644 --- a/.forgejo/workflows/doc.yaml +++ b/.forgejo/workflows/doc.yaml @@ -3,7 +3,7 @@ jobs: build-doc: runs-on: docker container: - image: git.tkolb.de/amateurfunk/hamnet70/asciidoctor:1.4 + image: git.tkolb.de/amateurfunk/hamnet70/asciidoctor:1.5 steps: - uses: actions/checkout@v4 - run: pwd && ls -hla && cd doc && make @@ -11,11 +11,11 @@ jobs: with: name: documentation path: doc/out/ - deploy: + deploy-doc: needs: build-doc runs-on: docker container: - image: git.tkolb.de/amateurfunk/hamnet70/asciidoctor:1.4 + image: git.tkolb.de/amateurfunk/hamnet70/asciidoctor:1.5 steps: - run: mkdir ~/.ssh && echo "${{ secrets.SSH_KEY }}" > ~/.ssh/id_ed25519 && chmod 0600 ~/.ssh/id_ed25519 && echo "${{ secrets.SSH_KNOWN_HOST }}" > ~/.ssh/known_hosts - uses: actions/download-artifact@v3 diff --git a/doc/docker/Dockerfile b/doc/docker/Dockerfile index 965fa36..0bd57ea 100644 --- a/doc/docker/Dockerfile +++ b/doc/docker/Dockerfile @@ -8,6 +8,9 @@ RUN gem install asciidoctor asciidoctor-diagram # tools for diagram generation RUN apt install -y --no-install-recommends mscgen && apt clean +# tools for automatic deployment +RUN apt install -y --no-install-recommends rsync && apt clean + # run as unprivileged user in the container RUN useradd -m ciuser USER ciuser