Skip to content

Commit

Permalink
feat: Bump mark version add chrome for mermaid support (#13)
Browse files Browse the repository at this point in the history
* add MERMAID_PROVIDER to action inputs

* update mark to 9.7.0

* add chrome in builder and set user directive

* remove debug step
  • Loading branch information
brokenpip3 authored Jul 18, 2023
1 parent 50eefc7 commit a5222c0
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
FROM python:3-slim AS builder
ENV MARK="9.7.0"

ADD . /app
WORKDIR /app

RUN pip install --target=/app -r requirements.txt
RUN pip install --target=/app -r requirements.txt && \
apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tar curl gnupg2 && \
rm -rf /var/lib/apt/lists/* && \
curl -LO https://github.com/kovetskiy/mark/releases/download/${MARK}/mark_Linux_x86_64.tar.gz && \
tar -xvzf mark_Linux_x86_64.tar.gz && chmod +x mark && mv mark /usr/local/bin/mark \
&& curl -L https://dl-ssl.google.com/linux/linux_signing_key.pub |apt-key add - \
&& echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list \
&& apt update && apt-get install -y google-chrome-stable

FROM python:3-slim
ENV MARK="9.2.1"
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tar curl sudo && \
rm -rf /var/lib/apt/lists/*
RUN curl -LO https://github.com/kovetskiy/mark/releases/download/${MARK}/mark_${MARK}_Linux_x86_64.tar.gz && \
tar -xvzf mark_${MARK}_Linux_x86_64.tar.gz && \
chmod +x mark && \
sudo mv mark /usr/local/bin/mark

COPY --from=builder /app /app
COPY --from=builder /usr/local/bin/mark /usr/bin/mark
COPY --from=builder /usr/bin/google-chrome /usr/bin/google-chrome
WORKDIR /app
ENV PYTHONPATH /app
ENV DOC_PREFIX /github/workspace/
ENV LOGURU_FORMAT "<lvl>{level:7} {message}</lvl>"
USER 1001:1001
ENTRYPOINT [ "python" ]
CMD ["/app/mark2confluence/main.py"]

0 comments on commit a5222c0

Please sign in to comment.