Merge "Fix frontend docker"