diff options
| author | Doug Breaux <25640850+dougbreaux@users.noreply.github.com> | 2020-12-04 16:12:39 -0600 |
|---|---|---|
| committer | Doug Breaux <25640850+dougbreaux@users.noreply.github.com> | 2020-12-04 16:12:39 -0600 |
| commit | 495545f2f07f00ead911908d8bee9a572889eced (patch) | |
| tree | dc22459dafbb5e733ea7615dfd5ae09702db3f6f | |
| parent | e4b8330e459b598328bf250208386c06ec257b08 (diff) | |
| download | Shaarli-495545f2f07f00ead911908d8bee9a572889eced.tar.gz Shaarli-495545f2f07f00ead911908d8bee9a572889eced.tar.zst Shaarli-495545f2f07f00ead911908d8bee9a572889eced.zip | |
newer alpine (for newer PHP) and apk upgrade #1655
| -rw-r--r-- | Dockerfile | 5 |
1 files changed, 3 insertions, 2 deletions
| @@ -26,7 +26,7 @@ RUN cd shaarli \ | |||
| 26 | 26 | ||
| 27 | # Stage 4: | 27 | # Stage 4: |
| 28 | # - Shaarli image | 28 | # - Shaarli image |
| 29 | FROM alpine:3.8 | 29 | FROM alpine:3.12 |
| 30 | LABEL maintainer="Shaarli Community" | 30 | LABEL maintainer="Shaarli Community" |
| 31 | 31 | ||
| 32 | RUN apk --update --no-cache add \ | 32 | RUN 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 | ||
| 51 | COPY .docker/nginx.conf /etc/nginx/nginx.conf | 52 | COPY .docker/nginx.conf /etc/nginx/nginx.conf |
| 52 | COPY .docker/php-fpm.conf /etc/php7/php-fpm.conf | 53 | COPY .docker/php-fpm.conf /etc/php7/php-fpm.conf |