diff --git a/.github/workflows/standard-with-pandoc-build.yml b/.github/workflows/standard-with-pandoc-build.yml index 6848b61..eccd70c 100644 --- a/.github/workflows/standard-with-pandoc-build.yml +++ b/.github/workflows/standard-with-pandoc-build.yml @@ -12,6 +12,7 @@ on: env: DTC_VERSION: v3.3 + PANDOC_VERSION: 3.1.12.1 jobs: docker: @@ -37,7 +38,9 @@ jobs: uses: docker/build-push-action@v3 with: context: alpine-with-pandoc - build-args: DTC_VERSION=${{ env.DTC_VERSION }} + build-args: | + DTC_VERSION=${{ env.DTC_VERSION }} + PANDOC_VERSION=${{ env.PANDOC_VERSION }} load: true # TODO Make tag/version dependent on branch (push normal version only when on main branch, otherwise derive temporary version from branch name/datetime/commit-id/...) tags: doctoolchain/doctoolchain-with-pandoc:${{ env.DTC_VERSION }} diff --git a/alpine-with-pandoc/Dockerfile b/alpine-with-pandoc/Dockerfile index 6ed608b..1f2f89b 100644 --- a/alpine-with-pandoc/Dockerfile +++ b/alpine-with-pandoc/Dockerfile @@ -20,11 +20,12 @@ RUN gem update --system RUN gem install rdoc --no-document RUN gem install pygments.rb +ARG PANDOC_VERSION WORKDIR /opt -RUN wget https://github.com/jgm/pandoc/releases/download/3.0.1/pandoc-3.0.1-linux-amd64.tar.gz -O /opt/pandoc.tar.gz -RUN tar -xzf /opt/pandoc.tar.gz -C /opt -RUN rm /opt/pandoc.tar.gz -ENV PATH=$PATH:/opt/pandoc-3.0.1/bin/ +RUN wget https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/pandoc-${PANDOC_VERSION}-linux-amd64.tar.gz -O /opt/pandoc.tar.gz \ + && tar -xzf /opt/pandoc.tar.gz -C /opt \ + && rm /opt/pandoc.tar.gz +ENV PATH=$PATH:/opt/pandoc-${PANDOC_VERSION}/bin/ USER dtcuser WORKDIR /home/dtcuser