diff options
| -rw-r--r-- | Dockerfile | 4 |
1 files changed, 0 insertions, 4 deletions
| @@ -5,11 +5,7 @@ FROM python:3-alpine as docs | |||
| 5 | ADD . /usr/src/app/shaarli | 5 | ADD . /usr/src/app/shaarli |
| 6 | RUN cd /usr/src/app/shaarli \ | 6 | RUN cd /usr/src/app/shaarli \ |
| 7 | && pip install --no-cache-dir mkdocs \ | 7 | && pip install --no-cache-dir mkdocs \ |
| 8 | <<<<<<< HEAD | ||
| 9 | && mkdocs build | ||
| 10 | ======= | ||
| 11 | && mkdocs build --clean | 8 | && mkdocs build --clean |
| 12 | >>>>>>> v0.10.0 | ||
| 13 | 9 | ||
| 14 | # Stage 2: | 10 | # Stage 2: |
| 15 | # - Resolve PHP dependencies with Composer | 11 | # - Resolve PHP dependencies with Composer |