Change to Alpine for x2 smaller image

This commit is contained in:
Quentin McGaw (desktop)
2021-08-04 11:03:28 -04:00
parent ce263e49eb
commit 78ba73f34b
4 changed files with 31 additions and 33 deletions

View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
set -e
@ -6,7 +6,7 @@ echo "Running version ${VERSION} commit ${COMMIT} built on ${CREATED}"
# Show versions
echo "supervisord version: $(supervisord version)"
php-fpm7.3 -v | head -n 1
php-fpm7 -v | head -n 1
nginx -v
if [ "${DB_CONNECTION}" = "sqlite" ]; then
@ -14,7 +14,7 @@ if [ "${DB_CONNECTION}" = "sqlite" ]; then
touch /2fauth/database.sqlite
fi
rm -f /srv/database/database.sqlite
ln -sF /2fauth/database.sqlite /srv/database/database.sqlite
ln -s /2fauth/database.sqlite /srv/database/database.sqlite
fi
# Inject storage in /2fauth and use it with a symlink
@ -23,7 +23,7 @@ if [ ! -d /2fauth/storage ]; then
else
rm -r /srv/storage
fi
ln -sF /2fauth/storage /srv/storage
ln -s /2fauth/storage /srv/storage
# Note: ${COMMIT} is set by the CI
if [ -f /2fauth/installed ]; then

View File

@ -24,7 +24,7 @@ http {
error_page 404 /index.php;
location ~ \.php$ {
fastcgi_pass unix:/var/run/php/php7.3-fpm.sock;
fastcgi_pass 127.0.0.1:9000;
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
include fastcgi_params;
}

View File

@ -12,7 +12,7 @@ autorestart=false
startretries=0
[program:php-fpm]
command=/usr/sbin/php-fpm7.3 -F
command=/usr/sbin/php-fpm7 -F
[program:nginx]
command=/usr/sbin/nginx -g 'daemon off;'