aboutsummaryrefslogtreecommitdiffhomepage
path: root/Dockerfile.armhf
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2020-12-16 15:59:46 +0100
committerGitHub <noreply@github.com>2020-12-16 15:59:46 +0100
commit51dea3b87e648da58383d8e9111111c16db318d1 (patch)
tree62bc9b59a5ec8af76d34b070b54bffb4c4da6f80 /Dockerfile.armhf
parente4b8330e459b598328bf250208386c06ec257b08 (diff)
parentee07df357bce7bd407ba93fa6b10677b355f631f (diff)
downloadShaarli-51dea3b87e648da58383d8e9111111c16db318d1.tar.gz
Shaarli-51dea3b87e648da58383d8e9111111c16db318d1.tar.zst
Shaarli-51dea3b87e648da58383d8e9111111c16db318d1.zip
Merge pull request #1660 from e2jk/patch-1
Upgrade alpine from 3.8 to 3.10 in armhf Dockerfile
Diffstat (limited to 'Dockerfile.armhf')
-rw-r--r--Dockerfile.armhf8
1 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 5bbf6680..471f2397 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,7 +1,7 @@
1# Stage 1: 1# Stage 1:
2# - Copy Shaarli sources 2# - Copy Shaarli sources
3# - Build documentation 3# - Build documentation
4FROM arm32v6/alpine:3.8 as docs 4FROM arm32v6/alpine:3.10 as docs
5ADD . /usr/src/app/shaarli 5ADD . /usr/src/app/shaarli
6RUN apk --update --no-cache add py2-pip \ 6RUN apk --update --no-cache add py2-pip \
7 && cd /usr/src/app/shaarli \ 7 && cd /usr/src/app/shaarli \
@@ -10,7 +10,7 @@ RUN apk --update --no-cache add py2-pip \
10 10
11# Stage 2: 11# Stage 2:
12# - Resolve PHP dependencies with Composer 12# - Resolve PHP dependencies with Composer
13FROM arm32v6/alpine:3.8 as composer 13FROM arm32v6/alpine:3.10 as composer
14COPY --from=docs /usr/src/app/shaarli /app/shaarli 14COPY --from=docs /usr/src/app/shaarli /app/shaarli
15RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer \ 15RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer \
16 && cd /app/shaarli \ 16 && cd /app/shaarli \
@@ -18,7 +18,7 @@ RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer
18 18
19# Stage 3: 19# Stage 3:
20# - Frontend dependencies 20# - Frontend dependencies
21FROM arm32v6/alpine:3.8 as node 21FROM arm32v6/alpine:3.10 as node
22COPY --from=composer /app/shaarli /shaarli 22COPY --from=composer /app/shaarli /shaarli
23RUN apk --update --no-cache add yarn nodejs-current python2 build-base \ 23RUN apk --update --no-cache add yarn nodejs-current python2 build-base \
24 && cd /shaarli \ 24 && cd /shaarli \
@@ -28,7 +28,7 @@ RUN apk --update --no-cache add yarn nodejs-current python2 build-base \
28 28
29# Stage 4: 29# Stage 4:
30# - Shaarli image 30# - Shaarli image
31FROM arm32v6/alpine:3.8 31FROM arm32v6/alpine:3.10
32LABEL maintainer="Shaarli Community" 32LABEL maintainer="Shaarli Community"
33 33
34RUN apk --update --no-cache add \ 34RUN apk --update --no-cache add \