diff options
author | ArthurHoaro <arthur@hoa.ro> | 2018-07-28 12:49:30 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2018-07-28 12:49:30 +0200 |
commit | 32ee32517c9e999e61bda2a018c899e4b6fbd528 (patch) | |
tree | 7faed6d672f405ed05bdf22aabc9ff5028a0e5df /Dockerfile | |
parent | 7982c3ff183aa985177bdaeacda4feb22a739e00 (diff) | |
download | Shaarli-32ee32517c9e999e61bda2a018c899e4b6fbd528.tar.gz Shaarli-32ee32517c9e999e61bda2a018c899e4b6fbd528.tar.zst Shaarli-32ee32517c9e999e61bda2a018c899e4b6fbd528.zip |
Fix Docker merge issue
Diffstat (limited to 'Dockerfile')
-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 |