Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🚑 Fix Grocy startup issues #301

Merged
merged 1 commit into from
Jun 9, 2022
Merged

🚑 Fix Grocy startup issues #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion grocy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ RUN \
\
&& find /var/www/ -type f -name "*.md" -depth -exec rm -f {} \; \
&& rm -f -r \
/tmp/* \
/etc/nginx \
/etc/php8/php-fpm.d/www.conf \
/root/.composer \
/tmp/* \
/usr/lib/node_modules \
/usr/local/bin/composer \
/usr/local/share/.cache \
Expand Down
5 changes: 0 additions & 5 deletions grocy/rootfs/etc/cont-init.d/grocy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ if ! bashio::fs.directory_exists "/data/grocy"; then

# Setup structure
cp -R /var/www/grocy/data /data/grocy

# Ensure file permissions
chown -R nginx:nginx /data/grocy
find /data/grocy -not -perm 0644 -type f -exec chmod 0644 {} \;
find /data/grocy -not -perm 0755 -type d -exec chmod 0755 {} \;
fi

if ! bashio::fs.directory_exists "/data/grocy/viewcache"; then
Expand Down
1 change: 0 additions & 1 deletion grocy/rootfs/etc/fix-attrs.d/01-grocy
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions grocy/rootfs/etc/php8/templates/php-fpm.gtpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[{{ .name }}]
user = nginx
group = nginx
user = root
group = root
listen = 127.0.0.1:{{ .port }}
pm = dynamic
pm.max_children = 10
Expand Down
2 changes: 1 addition & 1 deletion grocy/rootfs/etc/services.d/php-fpm/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,4 @@ GROCY_CULTURE=$(bashio::config "culture")
GROCY_CURRENCY=$(bashio::config "currency")
GROCY_ENTRY_PAGE=$(bashio::config 'entry_page')

exec php-fpm8 --nodaemonize
exec php-fpm8 -R --nodaemonize