Skip to content

Commit

Permalink
Fixed bad file descriptor issue with latest nginx image
Browse files Browse the repository at this point in the history
Corrected "nginx" image tag listing
  • Loading branch information
ckulka committed Dec 12, 2022
1 parent 0a478fc commit 692fafb
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
docker-compose.override.yml
examples/acme.json

# Apple
*.DS_Store
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The following tags support multiple architectures, e.g. `amd64`, `arm32v7`, `arm
- [`0.9.3-nginx-php8.0`, `nginx-php8.0`](https://github.com/ckulka/baikal-docker/blob/0.9.3/nginx-php8.0.dockerfile)
- [`0.9.2`, `0.9.2-apache`](https://github.com/ckulka/baikal-docker/blob/0.9.2/apache.dockerfile)
- [`0.9.2-php8.0`, `0.9.2-apache-php8.0`, `apache-php8.0`, `latest-php8.0`](https://github.com/ckulka/baikal-docker/blob/0.9.2/apache-php8.0.dockerfile)
- [`0.9.2-nginx`, `nginx`](https://github.com/ckulka/baikal-docker/blob/0.9.2/nginx.dockerfile)
- [`0.9.2-nginx`](https://github.com/ckulka/baikal-docker/blob/0.9.2/nginx.dockerfile)
- [`0.9.2-nginx-php8.0`, `nginx-php8.0`](https://github.com/ckulka/baikal-docker/blob/0.9.2/nginx-php8.0.dockerfile)
- [`0.9.1`, `0.9.1-apache`](https://github.com/ckulka/baikal-docker/blob/0.9.1/apache.dockerfile)
- [`0.9.1-php8.0`, `0.9.1-apache-php8.0`](https://github.com/ckulka/baikal-docker/blob/0.9.1/apache-php8.0.dockerfile)
Expand Down
2 changes: 1 addition & 1 deletion files/40-disable-nginx-ipv6-if-unsupported.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ ME=$(basename $0)
# Disable IPv6 configuration if not supported or nginx is not installed
# Added to resolve https://github.com/ckulka/baikal-docker/issues/73
if nginx -t 2>&1 >/dev/null | grep -q '\[emerg\] socket() \[::\]:80 failed (97: Address family not supported by protocol)'; then
echo >&3 "$ME: info: Disable IPv6 in configuration"
echo "$ME: info: Disable IPv6 in configuration"
sed -i 's/listen \[::\]:80;/# listen \[::\]:80/' /etc/nginx/conf.d/default.conf
fi
6 changes: 3 additions & 3 deletions files/40-fix-baikal-permissions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ ME=$(basename $0)

if ! [ -d /var/www/baikal/Specific/db ]
then
echo >&3 "$ME: info: Creating new Baikal database folder"
echo "$ME: info: Creating new Baikal database folder"
mkdir -p /var/www/baikal/Specific/db
fi

# Detect if we're running in the Apache httpd image
if [ ! -z ${APACHE_CONFDIR+x} ]
then
echo >&3 "$ME: info: Adjusting Baikal file permissions for Apache httpd"
echo "$ME: info: Adjusting Baikal file permissions for Apache httpd"
chown -R www-data:www-data /var/www/baikal

# Inject ServerName and ServerAlias if specified
Expand All @@ -31,6 +31,6 @@ fi
# Detect if we're running in the nginx image
if [ ! -z ${NGINX_VERSION+x} ]
then
echo >&3 "$ME: info: Adjusting Baikal file permissions for nginx"
echo "$ME: info: Adjusting Baikal file permissions for nginx"
chown -R nginx:nginx /var/www/baikal
fi
4 changes: 2 additions & 2 deletions files/40-php-fpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ ME=$(basename $0)

# Start PHP FPM if it exists
if [ -f "/etc/init.d/php8.0-fpm" ]; then
echo >&3 "$ME: info: Starting PHP 8.0"
echo "$ME: info: Starting PHP 8.0"
/etc/init.d/php8.0-fpm start
elif [ -f "/etc/init.d/php8.1-fpm" ]; then
echo >&3 "$ME: info: Starting PHP 8.1"
echo "$ME: info: Starting PHP 8.1"
/etc/init.d/php8.1-fpm start
fi

0 comments on commit 692fafb

Please sign in to comment.