Merge nginx-php deployments

• move the nginx container into the php container
• change the nginx config (image/nginx/default.conf) upstream server php-fpm -> port/socket