2 files changed, 7 insertions, 7 deletions
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 5bbf6680..471f2397 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,7 +1,7 @@
 # Stage 1:
 # - Copy Shaarli sources
 # - Build documentation
-FROM arm32v6/alpine:3.8 as docs
+FROM arm32v6/alpine:3.10 as docs
 ADD . /usr/src/app/shaarli
 RUN apk --update --no-cache add py2-pip \
    && cd /usr/src/app/shaarli \
@@ -10,7 +10,7 @@ RUN apk --update --no-cache add py2-pip \
 # Stage 2:
 # - 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
 RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer \
    && cd /app/shaarli \
@@ -18,7 +18,7 @@ RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer
 # Stage 3:
 # - Frontend dependencies
-FROM arm32v6/alpine:3.8 as node
+FROM arm32v6/alpine:3.10 as node
 COPY --from=composer /app/shaarli /shaarli
 RUN apk --update --no-cache add yarn nodejs-current python2 build-base \
    && cd /shaarli \
@@ -28,7 +28,7 @@ RUN apk --update --no-cache add yarn nodejs-current python2 build-base \
 # Stage 4:
 # - Shaarli image
-FROM arm32v6/alpine:3.8
+FROM arm32v6/alpine:3.10
 LABEL maintainer="Shaarli Community"
 RUN apk --update --no-cache add \
diff --git a/yarn.lock b/yarn.lock
index 55bd9827..97fb0fad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3052,9 +3052,9 @@ inherits@2.0.3:
  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 ini@^1.3.4, ini@^1.3.5:
-  version "1.3.5"
+  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
 interpret@^1.4.0:
  version "1.4.0"

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
4	FROM arm32v6/alpine:3.8 as docs	4	FROM arm32v6/alpine:3.10 as docs
5	ADD . /usr/src/app/shaarli	5	ADD . /usr/src/app/shaarli
6	RUN apk --update --no-cache add py2-pip \	6	RUN 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
13	FROM arm32v6/alpine:3.8 as composer	13	FROM arm32v6/alpine:3.10 as composer
14	COPY --from=docs /usr/src/app/shaarli /app/shaarli	14	COPY --from=docs /usr/src/app/shaarli /app/shaarli
15	RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer \	15	RUN 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
21	FROM arm32v6/alpine:3.8 as node	21	FROM arm32v6/alpine:3.10 as node
22	COPY --from=composer /app/shaarli /shaarli	22	COPY --from=composer /app/shaarli /shaarli
23	RUN apk --update --no-cache add yarn nodejs-current python2 build-base \	23	RUN 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
31	FROM arm32v6/alpine:3.8	31	FROM arm32v6/alpine:3.10
32	LABEL maintainer="Shaarli Community"	32	LABEL maintainer="Shaarli Community"
33		33
34	RUN apk --update --no-cache add \	34	RUN apk --update --no-cache add \


diff --git a/yarn.lock b/yarn.lock index 55bd9827..97fb0fad 100644 --- a/yarn.lock +++ b/yarn.lock
@@ -3052,9 +3052,9 @@ inherits@2.0.3:
3052	integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=	3052	integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
3053		3053
3054	ini@^1.3.4, ini@^1.3.5:	3054	ini@^1.3.4, ini@^1.3.5:
3055	version "1.3.5"	3055	version "1.3.7"
3056	resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"	3056	resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
3057	integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==	3057	integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
3058		3058
3059	interpret@^1.4.0:	3059	interpret@^1.4.0:
3060	version "1.4.0"	3060	version "1.4.0"