Knah-Tsaeb
/
MyShaarli
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix armhf Dockerfile

This commit is contained in:
Agurato 2019-06-02 12:52:07 +02:00
parent 86aa248654
commit e14d47cc55
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile.armhf
View File

@ -3,7 +3,7 @@
# - Build documentation # - Build documentation
FROM arm32v6/alpine:3.8 as docs FROM arm32v6/alpine:3.8 as docs
ADD . /usr/src/app/shaarli ADD . /usr/src/app/shaarli
RUN apk --update --no-cache add py2-pip \ RUN apk --update --no-cache add py2-pip \
&& cd /usr/src/app/shaarli \ && cd /usr/src/app/shaarli \
&& pip install --no-cache-dir mkdocs \ && pip install --no-cache-dir mkdocs \
&& mkdocs build --clean && mkdocs build --clean
@ -12,7 +12,7 @@ RUN apk --update --no-cache add py2-pip \
# - Resolve PHP dependencies with Composer # - Resolve PHP dependencies with Composer
FROM arm32v6/alpine:3.8 as composer FROM arm32v6/alpine:3.8 as composer
COPY --from=docs /usr/src/app/shaarli /app/shaarli COPY --from=docs /usr/src/app/shaarli /app/shaarli
RUN apk --update --no-cache add php7-mbstring composer \ RUN apk --update --no-cache add php7-curl php7-mbstring composer \
&& cd /app/shaarli \ && cd /app/shaarli \
&& composer --prefer-dist --no-dev install && composer --prefer-dist --no-dev install
@ -36,7 +36,6 @@ RUN apk --update --no-cache add \
nginx \ nginx \
php7 \ php7 \
php7-ctype \ php7-ctype \
php7-curl \
php7-fpm \ php7-fpm \
php7-gd \ php7-gd \
php7-iconv \ php7-iconv \