aboutsummaryrefslogtreecommitdiffhomepage
path: root/Dockerfile
diff options
context:
space:
mode:
authorDoug Breaux <25640850+dougbreaux@users.noreply.github.com>2020-12-04 16:12:39 -0600
committerDoug Breaux <25640850+dougbreaux@users.noreply.github.com>2020-12-04 16:12:39 -0600
commit495545f2f07f00ead911908d8bee9a572889eced (patch)
treedc22459dafbb5e733ea7615dfd5ae09702db3f6f /Dockerfile
parente4b8330e459b598328bf250208386c06ec257b08 (diff)
downloadShaarli-495545f2f07f00ead911908d8bee9a572889eced.tar.gz
Shaarli-495545f2f07f00ead911908d8bee9a572889eced.tar.zst
Shaarli-495545f2f07f00ead911908d8bee9a572889eced.zip
newer alpine (for newer PHP) and apk upgrade #1655
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index f6120b71..bedc9496 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ RUN cd shaarli \
26 26
27# Stage 4: 27# Stage 4:
28# - Shaarli image 28# - Shaarli image
29FROM alpine:3.8 29FROM alpine:3.12
30LABEL maintainer="Shaarli Community" 30LABEL maintainer="Shaarli Community"
31 31
32RUN apk --update --no-cache add \ 32RUN apk --update --no-cache add \
@@ -46,7 +46,8 @@ RUN apk --update --no-cache add \
46 php7-xml \ 46 php7-xml \
47 php7-simplexml \ 47 php7-simplexml \
48 php7-zlib \ 48 php7-zlib \
49 s6 49 s6 \
50 && apk -U upgrade
50 51
51COPY .docker/nginx.conf /etc/nginx/nginx.conf 52COPY .docker/nginx.conf /etc/nginx/nginx.conf
52COPY .docker/php-fpm.conf /etc/php7/php-fpm.conf 53COPY .docker/php-fpm.conf /etc/php7/php-fpm.conf