Fix frontend build process for dev and missing admin/station menus (#5382)

* Fix path for frontend docker-compose.yml in static() command

* Set correct HOME env var for node user

* Revert removal of isset in AbstractBuildMenu event
This commit is contained in:
Vaalyn 2022-05-17 19:27:30 +02:00 committed by GitHub
parent 2ec0319edd
commit 3d8ada872c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions

View File

@ -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
}

View File

@ -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"]

View File

@ -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;
}