diff --git a/docker.sh b/docker.sh index f164c42af..7204860c4 100755 --- a/docker.sh +++ b/docker.sh @@ -763,9 +763,9 @@ restore-legacy() { # Usage: ./docker.sh static [static_container_command] # static() { - docker-compose -f frontend/docker-compose.yml down -v - docker-compose -f frontend/docker-compose.yml build - docker-compose --env-file=.env -f frontend/docker-compose.yml run --rm frontend "$@" + docker-compose -f docker-compose.frontend.yml down -v + docker-compose -f docker-compose.frontend.yml build + docker-compose --env-file=.env -f docker-compose.frontend.yml run --rm frontend "$@" exit } diff --git a/frontend/Dockerfile b/frontend/Dockerfile index ef65b8fe9..d6456a952 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -28,6 +28,7 @@ USER node:node VOLUME /data/frontend/node_modules ENV NODE_ENV=production +ENV HOME=/home/node # Define default command. ENTRYPOINT ["/entrypoint.sh"] diff --git a/src/Event/AbstractBuildMenu.php b/src/Event/AbstractBuildMenu.php index bb3fa9fb9..7467a233a 100644 --- a/src/Event/AbstractBuildMenu.php +++ b/src/Event/AbstractBuildMenu.php @@ -71,7 +71,7 @@ abstract class AbstractBuildMenu extends Event */ protected function filterMenuItem(array $item): bool { - if (empty($item['items'])) { + if (isset($item['items']) && empty($item['items'])) { return false; }