OpenSourceArk/mkdocs-material
1
0
Fork 0
mirror of https://github.com/squidfunk/mkdocs-material.git synced 2024-06-14 11:52:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5657 from squidfunk/revert-5626-user-req

Browse Source 
Revert "Add support for user-provided python packages"
This commit is contained in:
Martin Donath 2023-06-29 15:33:02 +02:00 committed by GitHub
commit 6c66437a70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -34,7 +34,7 @@ WORKDIR /tmp
COPY material material COPY material material
COPY package.json package.json COPY package.json package.json
COPY README.md README.md COPY README.md README.md
COPY *requirements.txt ./ COPY requirements.txt requirements.txt
COPY pyproject.toml pyproject.toml COPY pyproject.toml pyproject.toml
# Perform build and cleanup artifacts and caches # Perform build and cleanup artifacts and caches
@ -66,8 +66,6 @@ RUN \
"pillow>=9.0" \ "pillow>=9.0" \
"cairosvg>=2.5"; \ "cairosvg>=2.5"; \
fi \ fi \
&& \
[ -e user-requirements.txt ] && pip install -U -r user-requirements.txt \
&& \ && \
apk del .build \ apk del .build \
&& \ && \

12
docs/getting-started.md
View File

@ -117,12 +117,11 @@ The following plugins are bundled with the Docker image:
Material for MkDocs only bundles selected plugins in order to keep the size Material for MkDocs only bundles selected plugins in order to keep the size
of the official image small. If the plugin you want to use is not included, of the official image small. If the plugin you want to use is not included,
create a `user-requirements.txt` file in the repository root with the packages create a new `Dockerfile` and extend the official Docker image:
you want to install additionally, e.g.:
``` txt title="user-requirements.txt" ``` Dockerfile
mkdocs-macros-plugin==0.7.0 FROM squidfunk/mkdocs-material
mkdocs-glightbox>=0.3.1 RUN pip install ...
``` ```
Next, you can build the image with the following command: Next, you can build the image with the following command:
@ -131,8 +130,7 @@ The following plugins are bundled with the Docker image:
docker build -t squidfunk/mkdocs-material . docker build -t squidfunk/mkdocs-material .
``` ```
The new image will have additional packages installed and can be used The new image can be used exactly like the official image.
exactly like the official image.
### with git ### with git

3
docs/insiders/getting-started.md
View File

@ -79,9 +79,6 @@ docker login -u ${GH_USERNAME} -p ${GHCR_TOKEN} ghcr.io
docker pull ghcr.io/${GH_USERNAME}/mkdocs-material-insiders docker pull ghcr.io/${GH_USERNAME}/mkdocs-material-insiders
``` ```
Should you wish to add additional plugins to the insiders container image, follow the steps
outlined in the [Getting Started guide](../getting-started.md#with-docker).
[^2]: [^2]:
Earlier, Insiders provided a dedicated Docker image which was available to Earlier, Insiders provided a dedicated Docker image which was available to
all sponsors. On March 21, 2021, the image was deprecated for the reasons all sponsors. On March 21, 2021, the image was deprecated for the reasons