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

Merge pull request #1660 from e2jk/patch-1

Browse source 
Upgrade alpine from 3.8 to 3.10 in armhf Dockerfile
This commit is contained in:
ArthurHoaro 2020-12-16 15:59:46 +01:00 committed by GitHub
commit 51dea3b87e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile.armhf
View file

@ -1,7 +1,7 @@
# Stage 1: # Stage 1:
# - Copy Shaarli sources # - Copy Shaarli sources
# - Build documentation # - Build documentation
FROM arm32v6/alpine:3.8 as docs FROM arm32v6/alpine:3.10 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 \
@ -10,7 +10,7 @@ RUN apk --update --no-cache add py2-pip \
# Stage 2: # Stage 2:
# - Resolve PHP dependencies with Composer # - Resolve PHP dependencies with Composer
FROM arm32v6/alpine:3.8 as composer FROM arm32v6/alpine:3.10 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-curl php7-mbstring php7-simplexml composer \ RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer \
&& cd /app/shaarli \ && cd /app/shaarli \
@ -18,7 +18,7 @@ RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer
# Stage 3: # Stage 3:
# - Frontend dependencies # - Frontend dependencies
FROM arm32v6/alpine:3.8 as node FROM arm32v6/alpine:3.10 as node
COPY --from=composer /app/shaarli /shaarli COPY --from=composer /app/shaarli /shaarli
RUN apk --update --no-cache add yarn nodejs-current python2 build-base \ RUN apk --update --no-cache add yarn nodejs-current python2 build-base \
&& cd /shaarli \ && cd /shaarli \
@ -28,7 +28,7 @@ RUN apk --update --no-cache add yarn nodejs-current python2 build-base \
# Stage 4: # Stage 4:
# - Shaarli image # - Shaarli image
FROM arm32v6/alpine:3.8 FROM arm32v6/alpine:3.10
LABEL maintainer="Shaarli Community" LABEL maintainer="Shaarli Community"
RUN apk --update --no-cache add \ RUN apk --update --no-cache add \