diff --git a/.github/workflows/test-integration.yaml b/.github/workflows/test-integration.yaml index 51e2b1ab0..cd157edad 100644 --- a/.github/workflows/test-integration.yaml +++ b/.github/workflows/test-integration.yaml @@ -42,7 +42,7 @@ jobs: fail-fast: true matrix: parallel: [12] - index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 , 11] + index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] steps: - name: Check out code diff --git a/docs/check.Dockerfile b/docs/check.Dockerfile index d33a46af3..824a97081 100644 --- a/docs/check.Dockerfile +++ b/docs/check.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 as alpine +FROM alpine:3.20 RUN apk --no-cache --no-progress add \ build-base \ diff --git a/docs/docs.Dockerfile b/docs/docs.Dockerfile index ee10a5302..2ed4d0528 100644 --- a/docs/docs.Dockerfile +++ b/docs/docs.Dockerfile @@ -1,10 +1,12 @@ -FROM alpine:3.14 +FROM alpine:3.20 -ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/bin +ENV PATH="${PATH}:/venv/bin" COPY requirements.txt /mkdocs/ WORKDIR /mkdocs VOLUME /mkdocs RUN apk --no-cache --no-progress add py3-pip gcc musl-dev python3-dev \ - && pip3 install --user -r requirements.txt + && python3 -m venv /venv \ + && source /venv/bin/activate \ + && pip3 install -r requirements.txt diff --git a/docs/requirements.txt b/docs/requirements.txt index 8274f4d68..68126a411 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,45 +1,23 @@ -mkdocs==1.2.2 +markdown-include==0.5.1 +mkdocs==1.2.4 +mkdocs-exclude==1.0.2 mkdocs-traefiklabs>=100.0.7 -appdirs==1.4.4 -CacheControl==0.12.6 -certifi==2020.12.5 -chardet==4.0.0 -click==8.0.4 -colorama==0.4.4 -contextlib2==0.6.0 -distlib==0.3.1 -distro==1.5.0 -ghp-import==2.0.2 -html5lib==1.1 -idna==3.2 -importlib-metadata==4.11.3 -Jinja2==3.0.0 -lockfile==0.12.2 +click==8.1.7 +colorama==0.4.6 +ghp-import==2.1.0 +importlib_metadata==7.1.0 +Jinja2==3.1.3 Markdown==3.3.6 -markdown-include==0.5.1 -MarkupSafe==2.1.1 +MarkupSafe==2.1.5 mergedeep==1.3.4 -mkdocs-bootswatch==1.0 -mkdocs-exclude==1.0.2 -mkdocs-material-extensions==1.0.3 -msgpack==1.0.2 -ordered-set==4.0.2 -packaging==20.9 -pep517==0.10.0 -progress==1.5 -Pygments==2.11.2 +mkdocs-material-extensions==1.3.1 +packaging==24.0 +Pygments==2.18.0 pymdown-extensions==7.0 -pyparsing==2.4.7 -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 PyYAML==6.0.1 -pyyaml-env-tag==0.1 -requests==2.25.1 -retrying==1.3.3 -six==1.15.0 -toml==0.10.2 -urllib3==1.26.5 -watchdog==2.1.7 -webencodings==0.5.1 -zipp==3.7.0 - +pyyaml_env_tag==0.1 +six==1.16.0 +watchdog==4.0.0 +zipp==3.18.1 diff --git a/docs/runtime.txt b/docs/runtime.txt deleted file mode 100644 index 475ba515c..000000000 --- a/docs/runtime.txt +++ /dev/null @@ -1 +0,0 @@ -3.7