Skip to content

Commit 45063ca

Browse files
committed
upgrade to alpine 3.20
1 parent c60607e commit 45063ca

File tree

4 files changed

+7
-299
lines changed

4 files changed

+7
-299
lines changed

docker/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM alpine:edge
1+
FROM alpine:3.20
22

3-
RUN apk add --no-cache redis pwgen sudo socat wget curl git nginx \
4-
php7-ctype php7-ftp php7-simplexml php7 php7-phar php7-curl php7-openssl php7-mbstring php7-json php7-dom php7-fpm
3+
RUN apk add --no-cache pwgen sudo socat wget curl git nginx \
4+
php83-ctype php83-ftp php83-simplexml php83 php83-phar php83-curl php83-openssl php83-mbstring php83-json php83-dom php83-fpm
55

66
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer
77
RUN mkdir -p /var/www/backupdrop
@@ -16,12 +16,13 @@ RUN cp /var/www/backupdrop/docker/rootfs/start.sh /etc/start.sh
1616
RUN chmod +x /etc/start.sh
1717

1818
# nginx stuff
19-
RUN cp /var/www/backupdrop/docker/rootfs/nginx.conf /etc/nginx/conf.d/default.conf
19+
ADD docker/rootfs/nginx.conf /etc/nginx/http.d/default.conf
2020
RUN mkdir -p /run/nginx
2121
RUN mkdir -p /var/log/nginx
2222

2323
# php stuff
24-
RUN cp /var/www/backupdrop/docker/rootfs/php7/* /etc/php7/.
24+
RUN sed -i 's/nobody/nginx/g' /etc/php83/php-fpm.d/www.conf
25+
RUN sed -i 's/E_ALL \& ~E_DEPRECATED \& ~E_STRICT/E_ALL \& ~E_DEPRECATED \& ~E_STRICT \& ~E_NOTICE \& ~E_WARNING/g' /etc/php83/php.ini
2526

2627
# web interface stuff
2728
WORKDIR /var/www/backupdrop/web/lib

docker/rootfs/php7/php-fpm.conf

Lines changed: 0 additions & 29 deletions
This file was deleted.

docker/rootfs/php7/php.ini

Lines changed: 0 additions & 264 deletions
This file was deleted.

docker/rootfs/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
cd /var/www/backupdrop
44

55
echo ' [+] Starting php'
6-
php-fpm7 &
6+
php-fpm83
77

88
chown -R nginx:nginx /var/www/ &
99

0 commit comments

Comments
 (0)