Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade Pandoc and pass the desired version at build time #55

Open
wants to merge 1 commit into
base: ng-beta
Choose a base branch
from
Open

upgrade Pandoc and pass the desired version at build time #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/standard-with-pandoc-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:

env:
DTC_VERSION: v3.3
PANDOC_VERSION: 3.1.12.1

jobs:
docker:
Expand All @@ -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 }}
Expand Down
9 changes: 5 additions & 4 deletions alpine-with-pandoc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down