Skip to content

Commit

Permalink
upgrade to alpine 3.20
Browse files Browse the repository at this point in the history
  • Loading branch information
geek-at committed Dec 6, 2024
1 parent c60607e commit 45063ca
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 299 deletions.
11 changes: 6 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM alpine:edge
FROM alpine:3.20

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

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

# nginx stuff
RUN cp /var/www/backupdrop/docker/rootfs/nginx.conf /etc/nginx/conf.d/default.conf
ADD docker/rootfs/nginx.conf /etc/nginx/http.d/default.conf
RUN mkdir -p /run/nginx
RUN mkdir -p /var/log/nginx

# php stuff
RUN cp /var/www/backupdrop/docker/rootfs/php7/* /etc/php7/.
RUN sed -i 's/nobody/nginx/g' /etc/php83/php-fpm.d/www.conf
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

# web interface stuff
WORKDIR /var/www/backupdrop/web/lib
Expand Down
29 changes: 0 additions & 29 deletions docker/rootfs/php7/php-fpm.conf

This file was deleted.

264 changes: 0 additions & 264 deletions docker/rootfs/php7/php.ini

This file was deleted.

2 changes: 1 addition & 1 deletion docker/rootfs/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
cd /var/www/backupdrop

echo ' [+] Starting php'
php-fpm7 &
php-fpm83

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

Expand Down

0 comments on commit 45063ca

Please sign in to comment.