diff --git a/Dockerfile b/Dockerfile index dbe50f7..112b402 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,26 +1,24 @@ -FROM python:3-slim AS builder -ENV MARK="9.9.0" - +FROM python:3.11-slim AS builder +ENV MARK="9.11.1" ADD . /app WORKDIR /app - 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 + tar -xvzf mark_Linux_x86_64.tar.gz && chmod +x mark && mv mark /usr/local/bin/mark && rm mark_Linux_x86_64.tar.gz \ + && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -FROM python:3-slim +FROM chromedp/headless-shell:114.0.5735.199 +RUN apt-get update \ +&& apt-get install --no-install-recommends -qq ca-certificates bash sed git dumb-init python3 \ +&& apt-get clean \ +&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* 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 "{level:7} {message}" -USER 1001:1001 -ENTRYPOINT [ "python" ] -CMD ["/app/mark2confluence/main.py"] +ENTRYPOINT ["/usr/bin/dumb-init", "--"] +CMD ["python3", "/app/mark2confluence/main.py"]