From 18c38f77c2937b8685759a5a33760e20732106bf Mon Sep 17 00:00:00 2001 From: Randy Fay Date: Tue, 2 Jun 2020 17:50:46 -0600 Subject: [PATCH] Rework ddev-webserver to base on ddev-images PHP version (#2290) --- containers/ddev-webserver/.gitignore | 4 +- containers/ddev-webserver/Dockerfile | 203 +++++++++--------- containers/ddev-webserver/Makefile | 24 ++- .../etc/apache2/apache-site-default.conf | 0 .../etc/apache2/apache2.conf | 0 .../etc/apache2/conf-available/charset.conf | 0 .../conf-available/localized-error-pages.conf | 0 .../other-vhosts-access-log.conf | 0 .../apache2/conf-available/php5.6-cgi.conf | 0 .../apache2/conf-available/php5.6-fpm.conf | 0 .../apache2/conf-available/php7.0-cgi.conf | 0 .../apache2/conf-available/php7.0-fpm.conf | 0 .../apache2/conf-available/php7.1-cgi.conf | 0 .../apache2/conf-available/php7.1-fpm.conf | 0 .../apache2/conf-available/php7.2-cgi.conf | 0 .../apache2/conf-available/php7.2-fpm.conf | 0 .../apache2/conf-available/php7.3-cgi.conf | 0 .../apache2/conf-available/php7.3-fpm.conf | 0 .../apache2/conf-available/php7.4-cgi.conf | 0 .../apache2/conf-available/php7.4-fpm.conf | 0 .../etc/apache2/conf-available/security.conf | 0 .../apache2/conf-available/serve-cgi-bin.conf | 0 .../etc/apache2/conf-enabled/.gitmanaged | 0 .../etc/apache2/envvars | 0 .../etc/apache2/magic | 0 .../apache2/mods-available/access_compat.load | 0 .../etc/apache2/mods-available/actions.conf | 0 .../etc/apache2/mods-available/actions.load | 0 .../etc/apache2/mods-available/alias.conf | 0 .../etc/apache2/mods-available/alias.load | 0 .../apache2/mods-available/allowmethods.load | 0 .../etc/apache2/mods-available/asis.load | 0 .../apache2/mods-available/auth_basic.load | 0 .../apache2/mods-available/auth_digest.load | 0 .../etc/apache2/mods-available/auth_form.load | 0 .../apache2/mods-available/authn_anon.load | 0 .../apache2/mods-available/authn_core.load | 0 .../etc/apache2/mods-available/authn_dbd.load | 0 .../etc/apache2/mods-available/authn_dbm.load | 0 .../apache2/mods-available/authn_file.load | 0 .../apache2/mods-available/authn_socache.load | 0 .../apache2/mods-available/authnz_fcgi.load | 0 .../apache2/mods-available/authnz_ldap.load | 0 .../apache2/mods-available/authz_core.load | 0 .../etc/apache2/mods-available/authz_dbd.load | 0 .../etc/apache2/mods-available/authz_dbm.load | 0 .../mods-available/authz_groupfile.load | 0 .../apache2/mods-available/authz_host.load | 0 .../apache2/mods-available/authz_owner.load | 0 .../apache2/mods-available/authz_user.load | 0 .../etc/apache2/mods-available/autoindex.conf | 0 .../etc/apache2/mods-available/autoindex.load | 0 .../etc/apache2/mods-available/buffer.load | 0 .../etc/apache2/mods-available/cache.load | 0 .../apache2/mods-available/cache_disk.conf | 0 .../apache2/mods-available/cache_disk.load | 0 .../apache2/mods-available/cache_socache.load | 0 .../etc/apache2/mods-available/cgi.load | 0 .../etc/apache2/mods-available/cgid.conf | 0 .../etc/apache2/mods-available/cgid.load | 0 .../apache2/mods-available/charset_lite.load | 0 .../etc/apache2/mods-available/data.load | 0 .../etc/apache2/mods-available/dav.load | 0 .../etc/apache2/mods-available/dav_fs.conf | 0 .../etc/apache2/mods-available/dav_fs.load | 0 .../etc/apache2/mods-available/dav_lock.load | 0 .../etc/apache2/mods-available/dbd.load | 0 .../etc/apache2/mods-available/deflate.conf | 0 .../etc/apache2/mods-available/deflate.load | 0 .../etc/apache2/mods-available/dialup.load | 0 .../etc/apache2/mods-available/dir.conf | 0 .../etc/apache2/mods-available/dir.load | 0 .../etc/apache2/mods-available/dump_io.load | 0 .../etc/apache2/mods-available/echo.load | 0 .../etc/apache2/mods-available/env.load | 0 .../etc/apache2/mods-available/expires.load | 0 .../apache2/mods-available/ext_filter.load | 0 .../apache2/mods-available/file_cache.load | 0 .../etc/apache2/mods-available/filter.load | 0 .../etc/apache2/mods-available/headers.load | 0 .../etc/apache2/mods-available/heartbeat.load | 0 .../apache2/mods-available/heartmonitor.load | 0 .../etc/apache2/mods-available/ident.load | 0 .../etc/apache2/mods-available/include.load | 0 .../etc/apache2/mods-available/info.conf | 0 .../etc/apache2/mods-available/info.load | 0 .../mods-available/lbmethod_bybusyness.load | 0 .../mods-available/lbmethod_byrequests.load | 0 .../mods-available/lbmethod_bytraffic.load | 0 .../mods-available/lbmethod_heartbeat.load | 0 .../etc/apache2/mods-available/ldap.conf | 0 .../etc/apache2/mods-available/ldap.load | 0 .../etc/apache2/mods-available/log_debug.load | 0 .../apache2/mods-available/log_forensic.load | 0 .../etc/apache2/mods-available/lua.load | 0 .../etc/apache2/mods-available/macro.load | 0 .../etc/apache2/mods-available/mime.conf | 0 .../etc/apache2/mods-available/mime.load | 0 .../apache2/mods-available/mime_magic.conf | 0 .../apache2/mods-available/mime_magic.load | 0 .../etc/apache2/mods-available/mpm_event.conf | 0 .../etc/apache2/mods-available/mpm_event.load | 0 .../apache2/mods-available/mpm_prefork.conf | 0 .../apache2/mods-available/mpm_prefork.load | 0 .../apache2/mods-available/mpm_worker.conf | 0 .../apache2/mods-available/mpm_worker.load | 0 .../apache2/mods-available/negotiation.conf | 0 .../apache2/mods-available/negotiation.load | 0 .../etc/apache2/mods-available/php5.6.conf | 0 .../etc/apache2/mods-available/php5.6.load | 0 .../etc/apache2/mods-available/php7.0.conf | 0 .../etc/apache2/mods-available/php7.0.load | 0 .../etc/apache2/mods-available/php7.1.conf | 0 .../etc/apache2/mods-available/php7.1.load | 0 .../etc/apache2/mods-available/php7.2.conf | 0 .../etc/apache2/mods-available/php7.2.load | 0 .../etc/apache2/mods-available/proxy.conf | 0 .../etc/apache2/mods-available/proxy.load | 0 .../etc/apache2/mods-available/proxy_ajp.load | 0 .../mods-available/proxy_balancer.conf | 0 .../mods-available/proxy_balancer.load | 0 .../apache2/mods-available/proxy_connect.load | 0 .../apache2/mods-available/proxy_express.load | 0 .../apache2/mods-available/proxy_fcgi.load | 0 .../apache2/mods-available/proxy_fdpass.load | 0 .../etc/apache2/mods-available/proxy_ftp.conf | 0 .../etc/apache2/mods-available/proxy_ftp.load | 0 .../apache2/mods-available/proxy_html.conf | 0 .../apache2/mods-available/proxy_html.load | 0 .../apache2/mods-available/proxy_http.load | 0 .../apache2/mods-available/proxy_scgi.load | 0 .../mods-available/proxy_wstunnel.load | 0 .../etc/apache2/mods-available/ratelimit.load | 0 .../etc/apache2/mods-available/reflector.load | 0 .../etc/apache2/mods-available/remoteip.load | 0 .../apache2/mods-available/reqtimeout.conf | 0 .../apache2/mods-available/reqtimeout.load | 0 .../etc/apache2/mods-available/request.load | 0 .../etc/apache2/mods-available/rewrite.load | 0 .../etc/apache2/mods-available/sed.load | 0 .../etc/apache2/mods-available/session.load | 0 .../mods-available/session_cookie.load | 0 .../mods-available/session_crypto.load | 0 .../apache2/mods-available/session_dbd.load | 0 .../etc/apache2/mods-available/setenvif.conf | 0 .../etc/apache2/mods-available/setenvif.load | 0 .../apache2/mods-available/slotmem_plain.load | 0 .../apache2/mods-available/slotmem_shm.load | 0 .../apache2/mods-available/socache_dbm.load | 0 .../mods-available/socache_memcache.load | 0 .../apache2/mods-available/socache_shmcb.load | 0 .../etc/apache2/mods-available/speling.load | 0 .../etc/apache2/mods-available/ssl.conf | 0 .../etc/apache2/mods-available/ssl.load | 0 .../etc/apache2/mods-available/status.conf | 0 .../etc/apache2/mods-available/status.load | 0 .../apache2/mods-available/substitute.load | 0 .../etc/apache2/mods-available/suexec.load | 0 .../etc/apache2/mods-available/unique_id.load | 0 .../etc/apache2/mods-available/userdir.conf | 0 .../etc/apache2/mods-available/userdir.load | 0 .../etc/apache2/mods-available/usertrack.load | 0 .../apache2/mods-available/vhost_alias.load | 0 .../etc/apache2/mods-available/xml2enc.load | 0 .../etc/apache2/mods-enabled/.gitmanaged | 0 .../etc/apache2/ports.conf | 0 .../etc/bash.bashrc | 0 .../etc/bash.nointeractive.bashrc | 0 .../bashrc/composer-bin-dir-in-path.bashrc | 0 .../etc/group | 0 .../etc/nginx/monitoring.conf | 0 .../etc/nginx/nginx-site-backdrop.conf | 0 .../etc/nginx/nginx-site-default.conf | 0 .../etc/nginx/nginx-site-drupal6.conf | 0 .../etc/nginx/nginx-site-drupal7.conf | 0 .../etc/nginx/nginx-site-drupal8.conf | 0 .../etc/nginx/nginx-site-drupal9.conf | 0 .../etc/nginx/nginx-site-laravel.conf | 0 .../etc/nginx/nginx-site-magento.conf | 0 .../etc/nginx/nginx-site-magento2.conf | 0 .../etc/nginx/nginx-site-typo3.conf | 0 .../etc/nginx/nginx-site-wordpress.conf | 0 .../etc/nginx/nginx.conf | 0 .../etc/nginx/nginx_backdrop.conf | 0 .../etc/nginx/nginx_default.conf | 0 .../etc/nginx/nginx_drupal6.conf | 0 .../etc/nginx/nginx_drupal7.conf | 0 .../etc/nginx/nginx_drupal8.conf | 0 .../etc/nginx/nginx_drupal9.conf | 0 .../etc/nginx/nginx_laravel.conf | 0 .../etc/nginx/nginx_magento.conf | 0 .../etc/nginx/nginx_magento2.conf | 0 .../etc/nginx/nginx_typo3.conf | 0 .../etc/nginx/nginx_wordpress.conf | 0 .../etc/passwd | 0 .../etc/php/5.6/apache2/php.ini | 0 .../etc/php/5.6/cgi/php.ini | 0 .../etc/php/5.6/cli/php.ini | 0 .../etc/php/5.6/fpm/php-fpm.conf | 0 .../etc/php/5.6/fpm/php.ini | 0 .../etc/php/5.6/fpm/pool.d/www.conf | 0 .../etc/php/5.6/mods-available/xdebug.ini | 0 .../etc/php/7.0/apache2/php.ini | 0 .../etc/php/7.0/cgi/php.ini | 0 .../etc/php/7.0/cli/php.ini | 0 .../etc/php/7.0/fpm/php-fpm.conf | 0 .../etc/php/7.0/fpm/php.ini | 0 .../etc/php/7.0/fpm/pool.d/www.conf | 0 .../etc/php/7.0/mods-available/xdebug.ini | 0 .../etc/php/7.1/apache2/php.ini | 0 .../etc/php/7.1/cgi/php.ini | 0 .../etc/php/7.1/cli/php.ini | 0 .../etc/php/7.1/fpm/php-fpm.conf | 0 .../etc/php/7.1/fpm/php.ini | 0 .../etc/php/7.1/fpm/pool.d/www.conf | 0 .../etc/php/7.1/mods-available/xdebug.ini | 0 .../etc/php/7.2/apache2/php.ini | 0 .../etc/php/7.2/cgi/php.ini | 0 .../etc/php/7.2/cli/php.ini | 0 .../etc/php/7.2/fpm/php-fpm.conf | 0 .../etc/php/7.2/fpm/php.ini | 0 .../etc/php/7.2/fpm/pool.d/www.conf | 0 .../etc/php/7.2/mods-available/xdebug.ini | 0 .../etc/php/7.3/apache2/php.ini | 0 .../etc/php/7.3/cgi/php.ini | 0 .../etc/php/7.3/cli/php.ini | 0 .../etc/php/7.3/fpm/php-fpm.conf | 0 .../etc/php/7.3/fpm/php.ini | 0 .../etc/php/7.3/fpm/pool.d/www.conf | 0 .../etc/php/7.3/mods-available/xdebug.ini | 0 .../etc/php/7.4/apache2/php.ini | 0 .../etc/php/7.4/cgi/php.ini | 0 .../etc/php/7.4/cli/php.ini | 0 .../etc/php/7.4/fpm/php-fpm.conf | 0 .../etc/php/7.4/fpm/php.ini | 0 .../etc/php/7.4/fpm/pool.d/www.conf | 0 .../etc/php/7.4/mods-available/xdebug.ini | 0 .../etc/profile | 0 .../etc/skel/.bashrc | 0 .../etc/skel/.profile | 0 .../etc/sudoers.d/ddev | 0 .../etc/supervisor/apache.conf | 0 .../etc/supervisor/conf.d/mailhog.conf | 0 .../etc/supervisor/conf.d/supervisor.conf | 0 .../etc/supervisor/php-fpm.conf | 0 .../supervisor/supervisord-apache-cgi.conf | 0 .../supervisor/supervisord-apache-fpm.conf | 0 .../etc/supervisor/supervisord-nginx-fpm.conf | 0 .../home/.composer/cache/.gitmanaged | 0 .../home/.drush/.gitmanaged | 0 .../home/.gitconfig | 0 .../home/.my.cnf | 0 .../home/.ssh/config | 0 .../usr/local/bin/disable_xdebug | 0 .../usr/local/bin/enable_xdebug | 0 .../usr/local/bin/kill_supervisor.py | 0 .../var/www/html/docroot/test/400.php | 0 .../var/www/html/docroot/test/401.php | 0 .../var/www/html/docroot/test/500.php | 0 .../var/www/html/docroot/test/fatal.php | 0 .../var/www/html/docroot/test/phptest.php | 0 .../var/www/html/docroot/test/test-email.php | 0 .../www/html/docroot/test/upstream-error.php | 0 .../var/www/html/docroot/test/xdebug.php | 0 .../var/www/phpstatus.php | 0 .../healthcheck.sh | 0 .../start.sh | 0 pkg/version/version.go | 2 +- 268 files changed, 131 insertions(+), 102 deletions(-) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/apache-site-default.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/apache2.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/charset.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/localized-error-pages.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/other-vhosts-access-log.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/php5.6-cgi.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/php5.6-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/php7.0-cgi.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/php7.0-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/php7.1-cgi.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/php7.1-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/php7.2-cgi.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/php7.2-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/php7.3-cgi.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/php7.3-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/php7.4-cgi.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/php7.4-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/security.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-available/serve-cgi-bin.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/conf-enabled/.gitmanaged (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/envvars (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/magic (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/access_compat.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/actions.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/actions.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/alias.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/alias.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/allowmethods.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/asis.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/auth_basic.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/auth_digest.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/auth_form.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authn_anon.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authn_core.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authn_dbd.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authn_dbm.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authn_file.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authn_socache.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authnz_fcgi.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authnz_ldap.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authz_core.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authz_dbd.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authz_dbm.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authz_groupfile.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authz_host.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authz_owner.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/authz_user.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/autoindex.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/autoindex.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/buffer.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/cache.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/cache_disk.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/cache_disk.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/cache_socache.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/cgi.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/cgid.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/cgid.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/charset_lite.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/data.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/dav.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/dav_fs.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/dav_fs.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/dav_lock.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/dbd.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/deflate.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/deflate.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/dialup.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/dir.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/dir.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/dump_io.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/echo.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/env.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/expires.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/ext_filter.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/file_cache.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/filter.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/headers.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/heartbeat.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/heartmonitor.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/ident.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/include.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/info.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/info.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/lbmethod_bybusyness.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/lbmethod_byrequests.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/lbmethod_bytraffic.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/lbmethod_heartbeat.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/ldap.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/ldap.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/log_debug.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/log_forensic.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/lua.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/macro.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/mime.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/mime.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/mime_magic.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/mime_magic.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/mpm_event.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/mpm_event.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/mpm_prefork.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/mpm_prefork.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/mpm_worker.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/mpm_worker.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/negotiation.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/negotiation.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/php5.6.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/php5.6.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/php7.0.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/php7.0.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/php7.1.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/php7.1.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/php7.2.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/php7.2.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy_ajp.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy_balancer.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy_balancer.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy_connect.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy_express.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy_fcgi.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy_fdpass.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy_ftp.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy_ftp.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy_html.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy_html.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy_http.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy_scgi.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/proxy_wstunnel.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/ratelimit.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/reflector.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/remoteip.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/reqtimeout.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/reqtimeout.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/request.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/rewrite.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/sed.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/session.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/session_cookie.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/session_crypto.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/session_dbd.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/setenvif.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/setenvif.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/slotmem_plain.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/slotmem_shm.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/socache_dbm.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/socache_memcache.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/socache_shmcb.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/speling.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/ssl.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/ssl.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/status.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/status.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/substitute.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/suexec.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/unique_id.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/userdir.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/userdir.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/usertrack.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/vhost_alias.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-available/xml2enc.load (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/mods-enabled/.gitmanaged (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/apache2/ports.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/bash.bashrc (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/bash.nointeractive.bashrc (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/bashrc/composer-bin-dir-in-path.bashrc (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/group (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/monitoring.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx-site-backdrop.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx-site-default.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx-site-drupal6.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx-site-drupal7.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx-site-drupal8.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx-site-drupal9.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx-site-laravel.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx-site-magento.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx-site-magento2.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx-site-typo3.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx-site-wordpress.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx_backdrop.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx_default.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx_drupal6.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx_drupal7.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx_drupal8.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx_drupal9.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx_laravel.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx_magento.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx_magento2.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx_typo3.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/nginx/nginx_wordpress.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/passwd (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/5.6/apache2/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/5.6/cgi/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/5.6/cli/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/5.6/fpm/php-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/5.6/fpm/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/5.6/fpm/pool.d/www.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/5.6/mods-available/xdebug.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.0/apache2/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.0/cgi/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.0/cli/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.0/fpm/php-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.0/fpm/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.0/fpm/pool.d/www.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.0/mods-available/xdebug.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.1/apache2/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.1/cgi/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.1/cli/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.1/fpm/php-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.1/fpm/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.1/fpm/pool.d/www.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.1/mods-available/xdebug.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.2/apache2/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.2/cgi/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.2/cli/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.2/fpm/php-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.2/fpm/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.2/fpm/pool.d/www.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.2/mods-available/xdebug.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.3/apache2/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.3/cgi/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.3/cli/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.3/fpm/php-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.3/fpm/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.3/fpm/pool.d/www.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.3/mods-available/xdebug.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.4/apache2/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.4/cgi/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.4/cli/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.4/fpm/php-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.4/fpm/php.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.4/fpm/pool.d/www.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/php/7.4/mods-available/xdebug.ini (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/profile (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/skel/.bashrc (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/skel/.profile (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/sudoers.d/ddev (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/supervisor/apache.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/supervisor/conf.d/mailhog.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/supervisor/conf.d/supervisor.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/supervisor/php-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/supervisor/supervisord-apache-cgi.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/supervisor/supervisord-apache-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/etc/supervisor/supervisord-nginx-fpm.conf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/home/.composer/cache/.gitmanaged (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/home/.drush/.gitmanaged (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/home/.gitconfig (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/home/.my.cnf (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/home/.ssh/config (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/usr/local/bin/disable_xdebug (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/usr/local/bin/enable_xdebug (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/usr/local/bin/kill_supervisor.py (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/var/www/html/docroot/test/400.php (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/var/www/html/docroot/test/401.php (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/var/www/html/docroot/test/500.php (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/var/www/html/docroot/test/fatal.php (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/var/www/html/docroot/test/phptest.php (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/var/www/html/docroot/test/test-email.php (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/var/www/html/docroot/test/upstream-error.php (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/var/www/html/docroot/test/xdebug.php (100%) rename containers/ddev-webserver/{files => ddev-webserver-base-files}/var/www/phpstatus.php (100%) rename containers/ddev-webserver/{scripts => ddev-webserver-base-scripts}/healthcheck.sh (100%) rename containers/ddev-webserver/{scripts => ddev-webserver-base-scripts}/start.sh (100%) diff --git a/containers/ddev-webserver/.gitignore b/containers/ddev-webserver/.gitignore index 0c0188756af..4f0b072c611 100644 --- a/containers/ddev-webserver/.gitignore +++ b/containers/ddev-webserver/.gitignore @@ -9,5 +9,5 @@ /VERSION.txt /.docker_image # These are not artifacts that should be ignored -!files/usr/bin/ -!files/usr/local/bin/ +!ddev-webserver-base-files/usr/bin/ +!ddev-webserver-base-files/usr/local/bin/ diff --git a/containers/ddev-webserver/Dockerfile b/containers/ddev-webserver/Dockerfile index 9d3db2849ed..89079081038 100644 --- a/containers/ddev-webserver/Dockerfile +++ b/containers/ddev-webserver/Dockerfile @@ -1,13 +1,10 @@ -FROM bitnami/minideb:buster +### ---------------------------ddev-webserver-base-------------------------------------- +### Build ddev-php-base from ddev-webserver-base +### ddev-php-base is the basic of ddev-php-prod (for DDEV-Live) +### and ddev-webserver-* (For DDEV-Local) +FROM drud/ddev-php-base:v0.1 as ddev-webserver-base ENV PHP_VERSIONS="php5.6 php7.0 php7.1 php7.2 php7.3 php7.4" -ENV PHP_DEFAULT_VERSION="7.3" -ENV PHP_INI=/etc/php/$PHP_DEFAULT_VERSION/fpm/php.ini - -ENV DRUSH_VERSION=8.3.2 -ENV DRUSH_LAUNCHER_VERSION=0.6.0 -ENV DRUSH_LAUNCHER_FALLBACK=/usr/local/bin/drush8 -ENV MAILHOG_VERSION=1.0.0 ENV BACKDROP_DRUSH_VERSION=1.3.1 ENV MKCERT_VERSION=v1.4.1 @@ -19,13 +16,6 @@ ENV APACHE_SITE_TEMPLATE /etc/apache2/apache-site.conf ENV WEBSERVER_DOCROOT /var/www/html # For backward compatibility only ENV NGINX_DOCROOT $WEBSERVER_DOCROOT - -# composer normally screams about running as root, we don't need that. -ENV COMPOSER_ALLOW_SUPERUSER 1 -ENV COMPOSER_CACHE_DIR /mnt/ddev-global-cache/composer -# Windows, especially Win10 Home/Docker toolbox, can take forever on composer build. -ENV COMPOSER_PROCESS_TIMEOUT 2000 - ENV TERMINUS_CACHE_DIR=/mnt/ddev-global-cache/terminus/cache # Defines vars in colon-separated notation to be subsituted with values for NGINX_SITE_TEMPLATE on start @@ -34,93 +24,83 @@ ENV NGINX_SITE_VARS '$WEBSERVER_DOCROOT,$NGINX_DOCROOT' ENV APACHE_SITE_VARS '$WEBSERVER_DOCROOT' ENV CAROOT /mnt/ddev-global-cache/mkcert -# Real location -ENV DDEV_LIVE_DOWNLOAD_URL https://downloads.ddev.com/ddev-live-cli/latest/linux/ddev-live.zip -ENV DDEV_LIVE_CONFIG_FILE_PATH /mnt/ddev-global-cache/ddev-live/cli-config.json -ENV DDEV_LIVE_NO_VERSION_PROMPT true - -# From "man bash": -# When bash is started non-interactively, to run a shell script, for example, -# it looks for the variable BASH_ENV in the environment, expands its value -# if it appears there, and uses the expanded value as the name of a file to read and execute. -ENV BASH_ENV /etc/bash.nointeractive.bashrc -RUN ln -fs /usr/share/zoneinfo/UTC /etc/localtime && dpkg-reconfigure --frontend noninteractive tzdata - -RUN set -o errexit && apt-get -qq update && \ - apt-get -qq install --no-install-recommends --no-install-suggests -y \ - procps \ - curl \ - ca-certificates \ - apt-transport-https \ - wget \ - fontconfig \ - bzip2 \ - ghostscript \ - gnupg \ - jq \ - locales-all \ - lsb-release && \ - wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \ - echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list && \ - wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - && \ - echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list && \ - wget -q -O /tmp/nginx_signing.key http://nginx.org/keys/nginx_signing.key && \ +RUN wget -q -O /tmp/nginx_signing.key http://nginx.org/keys/nginx_signing.key && \ apt-key add /tmp/nginx_signing.key && \ - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ - echo "deb http://nginx.org/packages/debian/ $(lsb_release -sc) nginx" >> /etc/apt/sources.list && \ - curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ - apt-get -qq update && \ - apt-get -qq install --no-install-recommends --no-install-suggests -y \ - less \ - git \ - mariadb-client \ - nginx \ - apache2 \ - nodejs \ - libcap2-bin \ - supervisor \ - sudo \ - imagemagick \ - iputils-ping \ - patch \ - telnet \ - netcat \ - iproute2 \ - vim \ - nano \ - gettext \ - ncurses-bin \ - yarn \ - zip \ - unzip \ - rsync \ - locales-all \ - libpcre3 \ - openssh-client \ - php-imagick \ - php-uploadprogress \ - sqlite3 && \ - for v in $PHP_VERSIONS; do apt-get -qq install --no-install-recommends --no-install-suggests -y $v-apcu $v-bcmath $v-bz2 $v-curl $v-cgi $v-cli $v-common $v-fpm $v-gd $v-intl $v-json $v-memcached $v-mysql $v-pgsql $v-mbstring $v-opcache $v-soap $v-redis $v-sqlite3 $v-readline $v-xdebug $v-xml $v-xmlrpc $v-zip libapache2-mod-$v || exit $?; done && \ - for v in php5.6 php7.0 php7.1; do apt-get -qq install --no-install-recommends --no-install-suggests -y $v-mcrypt || exit $?; done && \ - apt-get install blackfire-php -y --allow-unauthenticated && \ - apt-get -qq autoremove -y && \ - apt-get -qq clean -y && \ - rm -rf /var/lib/apt/lists/* + echo "deb http://nginx.org/packages/debian/ $(lsb_release -sc) nginx" > /etc/apt/sources.list.d/nginx.list + +RUN apt-get update && apt-get -qq install --no-install-recommends --no-install-suggests -y apache2 libcap2-bin locales-all nginx supervisor + +# Add additional modules not used in php-base +RUN for v in $PHP_VERSIONS; do \ + apt-get -qq install --no-install-recommends --no-install-suggests -y libapache2-mod-$v || exit $?; \ +done + +RUN apt-get -qq autoremove && apt-get -qq clean -y && rm -rf /var/lib/apt/lists/* # Arbitrary user needs to be able to bind to privileged ports (for nginx and apache2) RUN setcap CAP_NET_BIND_SERVICE=+eip /usr/sbin/nginx RUN setcap CAP_NET_BIND_SERVICE=+eip /usr/sbin/apache2 -ADD files / +ADD ddev-webserver-base-files / +ADD ddev-webserver-base-scripts / +# END ddev-webserver-base + +### ---------------------------ddev-webserver-prod-------------------------------------- +### Build ddev-webserver-prod, the hardened version of ddev-webserver-base +### (Withut dev features, single layer) +FROM scratch as ddev-webserver-prod +ENV NGINX_SITE_TEMPLATE /etc/nginx/nginx-site.conf +ENV APACHE_SITE_TEMPLATE /etc/apache2/apache-site.conf +ENV WEBSERVER_DOCROOT /var/www/html +# For backward compatibility only +ENV NGINX_DOCROOT $WEBSERVER_DOCROOT +ENV TERMINUS_CACHE_DIR=/mnt/ddev-global-cache/terminus/cache +ENV DRUSH_LAUNCHER_FALLBACK=/usr/local/bin/drush8 + +# Defines vars in colon-separated notation to be subsituted with values for NGINX_SITE_TEMPLATE on start +# NGINX_DOCROOT is for backward compatibility only, to break less people. +ENV NGINX_SITE_VARS '$WEBSERVER_DOCROOT,$NGINX_DOCROOT' +ENV APACHE_SITE_VARS '$WEBSERVER_DOCROOT' +COPY --from=ddev-webserver-base / / +# END ddev-webserver-prod + +### ---------------------------ddev-webserver-dev-base-------------------------------------- +### Build ddev-webserver-dev-base from ddev-webserver-base +FROM ddev-webserver-base as ddev-webserver-dev-base +ENV MAILHOG_VERSION=1.0.0 +ENV CAROOT /mnt/ddev-global-cache/mkcert +ENV PHP_DEFAULT_VERSION="7.3" +ENV DDEV_LIVE_DOWNLOAD_URL https://downloads.ddev.com/ddev-live-cli/latest/linux/ddev-live.zip +RUN wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - +RUN echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list +RUN apt-get update +RUN apt-get install blackfire-php -y --allow-unauthenticated +RUN apt-get install --no-install-recommends --no-install-suggests -y \ + fontconfig \ + gettext \ + git \ + iproute2 \ + iputils-ping \ + jq \ + libpcre3 \ + locales-all \ + nano \ + ncurses-bin \ + netcat \ + openssh-client \ + patch \ + rsync \ + sqlite3 \ + sudo \ + telnet \ + unzip \ + zip + +ADD ddev-webserver-base-files / RUN phpdismod xdebug -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -RUN curl -sSL "https://github.com/drush-ops/drush/releases/download/${DRUSH_VERSION}/drush.phar" -o /usr/local/bin/drush8 && chmod +x /usr/local/bin/drush8 -RUN curl -sSL "https://github.com/drush-ops/drush-launcher/releases/download/${DRUSH_LAUNCHER_VERSION}/drush.phar" -o /usr/local/bin/drush && chmod +x /usr/local/bin/drush RUN curl -sSL "https://github.com/mailhog/MailHog/releases/download/v${MAILHOG_VERSION}/MailHog_linux_amd64" -o /usr/local/bin/mailhog -RUN curl -sSL -o /usr/local/bin/wp-cli -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && chmod +x /usr/local/bin/wp-cli && ln -s /usr/local/bin/wp-cli /usr/local/bin/wp RUN curl -ssL -O https://raw.githubusercontent.com/pantheon-systems/terminus-installer/master/builds/installer.phar && php installer.phar install RUN curl -ssL -O $DDEV_LIVE_DOWNLOAD_URL && unzip ddev-live.zip && mv ddev-live /usr/local/bin && chmod +x /usr/local/bin/ddev-live && rm ddev-live.zip @@ -133,7 +113,6 @@ RUN curl -sSL https://raw.githubusercontent.com/netz98/n98-magerun2/${MAGERUN2_V RUN curl -sSL "https://drupalconsole.com/installer" -L -o /usr/local/bin/drupal && chmod +x /usr/local/bin/drupal - RUN curl -sSL https://github.com/backdrop-contrib/drush/releases/download/${BACKDROP_DRUSH_VERSION}/drush.zip -o /tmp/backdrop_drush.zip && unzip -o /tmp/backdrop_drush.zip -d /var/tmp/backdrop_drush_commands RUN mkdir -p /etc/nginx/sites-enabled /var/log/apache2 /var/run/apache2 /var/lib/apache2/module/enabled_by_admin /var/lib/apache2/module/disabled_by_admin && \ @@ -145,7 +124,7 @@ RUN mkdir -p /etc/nginx/sites-enabled /var/log/apache2 /var/run/apache2 /var/lib chmod -R ugo+rw /var/log/nginx/ && \ chmod ugo+rx /usr/local/bin/* && \ update-alternatives --set php /usr/bin/php${PHP_DEFAULT_VERSION} && \ - ln -s /usr/sbin/php-fpm${PHP_DEFAULT_VERSION} /usr/sbin/php-fpm + ln -sf /usr/sbin/php-fpm${PHP_DEFAULT_VERSION} /usr/sbin/php-fpm RUN chmod -R 777 /var/log @@ -170,12 +149,44 @@ RUN a2enmod ssl headers expires RUN chmod -R go-w /home/.ssh # scripts added last because they're most likely place to make changes, speeds up build -ADD scripts / +ADD ddev-webserver-base-scripts / RUN chmod ugo+x /start.sh /healthcheck.sh RUN addgroup --gid 98 testgroup && adduser testuser --ingroup testgroup --disabled-password --gecos "" --uid 98 -EXPOSE 80 8025 +EXPOSE 80 443 8025 HEALTHCHECK --interval=1s --retries=10 --timeout=120s --start-period=10s CMD ["/healthcheck.sh"] +CMD ["/start.sh"] +RUN apt-get -qq clean -y && rm -rf /var/lib/apt/lists/* +#END ddev-webserver-dev-base + +### ---------------------------ddev-webserver-------------------------------------- +### This could be known as ddev-webserver-dev as it's development-env targeted +### But for historical reasons, it's just ddev-webserver +### Build ddev-webserver by turning ddev-webserver-dev-base into one layer +FROM scratch as ddev-webserver +ENV PHP_DEFAULT_VERSION="7.3" +ENV NGINX_SITE_TEMPLATE /etc/nginx/nginx-site.conf +ENV APACHE_SITE_TEMPLATE /etc/apache2/apache-site.conf +ENV WEBSERVER_DOCROOT /var/www/html +# For backward compatibility only +ENV NGINX_DOCROOT $WEBSERVER_DOCROOT +ENV TERMINUS_CACHE_DIR=/mnt/ddev-global-cache/terminus/cache +ENV CAROOT /mnt/ddev-global-cache/mkcert +ENV DRUSH_LAUNCHER_FALLBACK=/usr/local/bin/drush8 + +ENV DDEV_LIVE_CONFIG_FILE_PATH /mnt/ddev-global-cache/ddev-live/cli-config.json +ENV DDEV_LIVE_NO_VERSION_PROMPT true + +ENV BASH_ENV /etc/bash.nointeractive.bashrc +# Defines vars in colon-separated notation to be subsituted with values for NGINX_SITE_TEMPLATE on start +# NGINX_DOCROOT is for backward compatibility only, to break less people. +ENV NGINX_SITE_VARS '$WEBSERVER_DOCROOT,$NGINX_DOCROOT' +ENV APACHE_SITE_VARS '$WEBSERVER_DOCROOT' +COPY --from=ddev-webserver-dev-base / / +EXPOSE 80 8025 +HEALTHCHECK --interval=1s --retries=10 --timeout=120s --start-period=10s CMD ["/healthcheck.sh"] CMD ["/start.sh"] +#END ddev-webserver + diff --git a/containers/ddev-webserver/Makefile b/containers/ddev-webserver/Makefile index f4db1786f24..7200f8e6207 100644 --- a/containers/ddev-webserver/Makefile +++ b/containers/ddev-webserver/Makefile @@ -5,7 +5,9 @@ # Docker repo for a push DOCKER_ORG ?= drud DOCKER_REPO ?= $(DOCKER_ORG)/ddev-webserver -DEFAULT_IMAGES ?= ddev-webserver + +DEFAULT_IMAGES = ddev-webserver + # Top-level directories to build #SRC_DIRS := filexs drudapi secrets utils @@ -36,7 +38,23 @@ include ../../build-tools/makefile_components/base_push.mak #include build-tools/makefile_components/base_test_go.mak #include build-tools/makefile_components/base_test_python.mak -test: container + +DOCKER_BUILDKIT=1 + +container build: images + +images: $(DEFAULT_IMAGES) + +push: images + for item in $(DEFAULT_IMAGES); do \ + docker push $(DOCKER_ORG)/$$item:$(VERSION); \ + echo "pushed $(DOCKER_ORG)/$$item"; \ + done + +ddev-webserver d: + DOCKER_BUILDKIT=$(DOCKER_BUILDKIT) docker build --label com.ddev.buildhost=${shell hostname} --target=$@ -t $(DOCKER_ORG)/$@:$(VERSION) $(DOCKER_ARGS) . + +test: images for item in $(DEFAULT_IMAGES); do \ - if [ -x tests/$$item/test.sh ]; then bash -c "tests/$$item/test.sh $(DOCKER_ORG)/$$item:$(VERSION)"; fi; \ + if [ -x tests/$$item/test.sh ]; then tests/$$item/test.sh $(DOCKER_ORG)/$$item:$(VERSION); fi; \ done diff --git a/containers/ddev-webserver/files/etc/apache2/apache-site-default.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/apache-site-default.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/apache-site-default.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/apache-site-default.conf diff --git a/containers/ddev-webserver/files/etc/apache2/apache2.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/apache2.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/apache2.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/apache2.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/charset.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/charset.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/charset.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/charset.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/localized-error-pages.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/localized-error-pages.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/localized-error-pages.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/localized-error-pages.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/other-vhosts-access-log.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/other-vhosts-access-log.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/other-vhosts-access-log.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/other-vhosts-access-log.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/php5.6-cgi.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php5.6-cgi.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/php5.6-cgi.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php5.6-cgi.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/php5.6-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php5.6-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/php5.6-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php5.6-fpm.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/php7.0-cgi.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.0-cgi.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/php7.0-cgi.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.0-cgi.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/php7.0-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.0-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/php7.0-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.0-fpm.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/php7.1-cgi.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.1-cgi.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/php7.1-cgi.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.1-cgi.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/php7.1-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.1-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/php7.1-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.1-fpm.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/php7.2-cgi.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.2-cgi.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/php7.2-cgi.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.2-cgi.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/php7.2-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.2-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/php7.2-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.2-fpm.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/php7.3-cgi.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.3-cgi.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/php7.3-cgi.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.3-cgi.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/php7.3-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.3-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/php7.3-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.3-fpm.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/php7.4-cgi.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.4-cgi.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/php7.4-cgi.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.4-cgi.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/php7.4-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.4-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/php7.4-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/php7.4-fpm.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/security.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/security.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/security.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/security.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-available/serve-cgi-bin.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/serve-cgi-bin.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-available/serve-cgi-bin.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-available/serve-cgi-bin.conf diff --git a/containers/ddev-webserver/files/etc/apache2/conf-enabled/.gitmanaged b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-enabled/.gitmanaged similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/conf-enabled/.gitmanaged rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/conf-enabled/.gitmanaged diff --git a/containers/ddev-webserver/files/etc/apache2/envvars b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/envvars similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/envvars rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/envvars diff --git a/containers/ddev-webserver/files/etc/apache2/magic b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/magic similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/magic rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/magic diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/access_compat.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/access_compat.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/access_compat.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/access_compat.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/actions.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/actions.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/actions.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/actions.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/actions.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/actions.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/actions.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/actions.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/alias.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/alias.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/alias.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/alias.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/alias.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/alias.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/alias.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/alias.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/allowmethods.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/allowmethods.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/allowmethods.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/allowmethods.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/asis.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/asis.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/asis.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/asis.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/auth_basic.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/auth_basic.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/auth_basic.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/auth_basic.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/auth_digest.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/auth_digest.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/auth_digest.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/auth_digest.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/auth_form.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/auth_form.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/auth_form.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/auth_form.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authn_anon.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authn_anon.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authn_anon.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authn_anon.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authn_core.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authn_core.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authn_core.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authn_core.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authn_dbd.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authn_dbd.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authn_dbd.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authn_dbd.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authn_dbm.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authn_dbm.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authn_dbm.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authn_dbm.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authn_file.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authn_file.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authn_file.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authn_file.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authn_socache.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authn_socache.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authn_socache.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authn_socache.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authnz_fcgi.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authnz_fcgi.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authnz_fcgi.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authnz_fcgi.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authnz_ldap.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authnz_ldap.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authnz_ldap.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authnz_ldap.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authz_core.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authz_core.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authz_core.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authz_core.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authz_dbd.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authz_dbd.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authz_dbd.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authz_dbd.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authz_dbm.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authz_dbm.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authz_dbm.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authz_dbm.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authz_groupfile.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authz_groupfile.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authz_groupfile.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authz_groupfile.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authz_host.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authz_host.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authz_host.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authz_host.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authz_owner.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authz_owner.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authz_owner.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authz_owner.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/authz_user.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authz_user.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/authz_user.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/authz_user.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/autoindex.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/autoindex.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/autoindex.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/autoindex.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/autoindex.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/autoindex.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/autoindex.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/autoindex.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/buffer.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/buffer.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/buffer.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/buffer.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/cache.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/cache.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/cache.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/cache.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/cache_disk.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/cache_disk.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/cache_disk.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/cache_disk.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/cache_disk.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/cache_disk.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/cache_disk.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/cache_disk.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/cache_socache.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/cache_socache.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/cache_socache.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/cache_socache.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/cgi.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/cgi.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/cgi.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/cgi.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/cgid.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/cgid.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/cgid.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/cgid.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/cgid.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/cgid.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/cgid.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/cgid.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/charset_lite.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/charset_lite.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/charset_lite.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/charset_lite.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/data.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/data.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/data.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/data.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/dav.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dav.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/dav.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dav.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/dav_fs.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dav_fs.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/dav_fs.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dav_fs.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/dav_fs.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dav_fs.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/dav_fs.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dav_fs.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/dav_lock.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dav_lock.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/dav_lock.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dav_lock.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/dbd.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dbd.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/dbd.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dbd.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/deflate.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/deflate.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/deflate.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/deflate.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/deflate.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/deflate.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/deflate.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/deflate.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/dialup.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dialup.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/dialup.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dialup.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/dir.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dir.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/dir.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dir.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/dir.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dir.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/dir.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dir.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/dump_io.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dump_io.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/dump_io.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/dump_io.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/echo.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/echo.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/echo.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/echo.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/env.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/env.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/env.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/env.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/expires.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/expires.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/expires.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/expires.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/ext_filter.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/ext_filter.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/ext_filter.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/ext_filter.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/file_cache.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/file_cache.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/file_cache.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/file_cache.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/filter.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/filter.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/filter.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/filter.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/headers.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/headers.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/headers.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/headers.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/heartbeat.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/heartbeat.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/heartbeat.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/heartbeat.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/heartmonitor.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/heartmonitor.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/heartmonitor.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/heartmonitor.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/ident.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/ident.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/ident.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/ident.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/include.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/include.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/include.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/include.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/info.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/info.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/info.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/info.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/info.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/info.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/info.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/info.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/lbmethod_bybusyness.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/lbmethod_bybusyness.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/lbmethod_bybusyness.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/lbmethod_bybusyness.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/lbmethod_byrequests.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/lbmethod_byrequests.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/lbmethod_byrequests.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/lbmethod_byrequests.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/lbmethod_bytraffic.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/lbmethod_bytraffic.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/lbmethod_bytraffic.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/lbmethod_bytraffic.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/lbmethod_heartbeat.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/lbmethod_heartbeat.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/lbmethod_heartbeat.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/lbmethod_heartbeat.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/ldap.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/ldap.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/ldap.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/ldap.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/ldap.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/ldap.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/ldap.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/ldap.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/log_debug.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/log_debug.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/log_debug.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/log_debug.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/log_forensic.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/log_forensic.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/log_forensic.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/log_forensic.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/lua.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/lua.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/lua.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/lua.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/macro.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/macro.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/macro.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/macro.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/mime.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mime.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/mime.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mime.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/mime.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mime.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/mime.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mime.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/mime_magic.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mime_magic.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/mime_magic.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mime_magic.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/mime_magic.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mime_magic.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/mime_magic.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mime_magic.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/mpm_event.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mpm_event.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/mpm_event.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mpm_event.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/mpm_event.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mpm_event.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/mpm_event.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mpm_event.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/mpm_prefork.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mpm_prefork.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/mpm_prefork.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mpm_prefork.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/mpm_prefork.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mpm_prefork.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/mpm_prefork.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mpm_prefork.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/mpm_worker.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mpm_worker.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/mpm_worker.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mpm_worker.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/mpm_worker.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mpm_worker.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/mpm_worker.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/mpm_worker.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/negotiation.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/negotiation.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/negotiation.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/negotiation.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/negotiation.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/negotiation.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/negotiation.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/negotiation.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/php5.6.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php5.6.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/php5.6.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php5.6.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/php5.6.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php5.6.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/php5.6.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php5.6.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/php7.0.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php7.0.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/php7.0.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php7.0.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/php7.0.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php7.0.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/php7.0.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php7.0.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/php7.1.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php7.1.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/php7.1.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php7.1.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/php7.1.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php7.1.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/php7.1.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php7.1.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/php7.2.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php7.2.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/php7.2.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php7.2.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/php7.2.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php7.2.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/php7.2.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/php7.2.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy_ajp.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_ajp.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy_ajp.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_ajp.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy_balancer.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_balancer.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy_balancer.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_balancer.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy_balancer.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_balancer.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy_balancer.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_balancer.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy_connect.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_connect.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy_connect.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_connect.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy_express.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_express.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy_express.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_express.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy_fcgi.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_fcgi.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy_fcgi.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_fcgi.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy_fdpass.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_fdpass.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy_fdpass.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_fdpass.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy_ftp.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_ftp.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy_ftp.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_ftp.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy_ftp.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_ftp.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy_ftp.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_ftp.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy_html.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_html.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy_html.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_html.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy_html.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_html.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy_html.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_html.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy_http.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_http.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy_http.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_http.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy_scgi.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_scgi.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy_scgi.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_scgi.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/proxy_wstunnel.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_wstunnel.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/proxy_wstunnel.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/proxy_wstunnel.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/ratelimit.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/ratelimit.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/ratelimit.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/ratelimit.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/reflector.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/reflector.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/reflector.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/reflector.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/remoteip.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/remoteip.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/remoteip.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/remoteip.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/reqtimeout.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/reqtimeout.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/reqtimeout.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/reqtimeout.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/reqtimeout.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/reqtimeout.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/reqtimeout.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/reqtimeout.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/request.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/request.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/request.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/request.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/rewrite.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/rewrite.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/rewrite.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/rewrite.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/sed.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/sed.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/sed.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/sed.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/session.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/session.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/session.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/session.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/session_cookie.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/session_cookie.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/session_cookie.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/session_cookie.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/session_crypto.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/session_crypto.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/session_crypto.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/session_crypto.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/session_dbd.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/session_dbd.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/session_dbd.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/session_dbd.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/setenvif.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/setenvif.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/setenvif.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/setenvif.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/setenvif.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/setenvif.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/setenvif.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/setenvif.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/slotmem_plain.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/slotmem_plain.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/slotmem_plain.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/slotmem_plain.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/slotmem_shm.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/slotmem_shm.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/slotmem_shm.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/slotmem_shm.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/socache_dbm.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/socache_dbm.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/socache_dbm.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/socache_dbm.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/socache_memcache.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/socache_memcache.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/socache_memcache.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/socache_memcache.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/socache_shmcb.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/socache_shmcb.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/socache_shmcb.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/socache_shmcb.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/speling.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/speling.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/speling.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/speling.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/ssl.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/ssl.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/ssl.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/ssl.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/ssl.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/ssl.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/ssl.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/ssl.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/status.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/status.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/status.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/status.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/status.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/status.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/status.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/status.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/substitute.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/substitute.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/substitute.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/substitute.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/suexec.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/suexec.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/suexec.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/suexec.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/unique_id.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/unique_id.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/unique_id.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/unique_id.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/userdir.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/userdir.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/userdir.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/userdir.conf diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/userdir.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/userdir.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/userdir.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/userdir.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/usertrack.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/usertrack.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/usertrack.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/usertrack.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/vhost_alias.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/vhost_alias.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/vhost_alias.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/vhost_alias.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-available/xml2enc.load b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/xml2enc.load similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-available/xml2enc.load rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-available/xml2enc.load diff --git a/containers/ddev-webserver/files/etc/apache2/mods-enabled/.gitmanaged b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-enabled/.gitmanaged similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/mods-enabled/.gitmanaged rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/mods-enabled/.gitmanaged diff --git a/containers/ddev-webserver/files/etc/apache2/ports.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/ports.conf similarity index 100% rename from containers/ddev-webserver/files/etc/apache2/ports.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/apache2/ports.conf diff --git a/containers/ddev-webserver/files/etc/bash.bashrc b/containers/ddev-webserver/ddev-webserver-base-files/etc/bash.bashrc similarity index 100% rename from containers/ddev-webserver/files/etc/bash.bashrc rename to containers/ddev-webserver/ddev-webserver-base-files/etc/bash.bashrc diff --git a/containers/ddev-webserver/files/etc/bash.nointeractive.bashrc b/containers/ddev-webserver/ddev-webserver-base-files/etc/bash.nointeractive.bashrc similarity index 100% rename from containers/ddev-webserver/files/etc/bash.nointeractive.bashrc rename to containers/ddev-webserver/ddev-webserver-base-files/etc/bash.nointeractive.bashrc diff --git a/containers/ddev-webserver/files/etc/bashrc/composer-bin-dir-in-path.bashrc b/containers/ddev-webserver/ddev-webserver-base-files/etc/bashrc/composer-bin-dir-in-path.bashrc similarity index 100% rename from containers/ddev-webserver/files/etc/bashrc/composer-bin-dir-in-path.bashrc rename to containers/ddev-webserver/ddev-webserver-base-files/etc/bashrc/composer-bin-dir-in-path.bashrc diff --git a/containers/ddev-webserver/files/etc/group b/containers/ddev-webserver/ddev-webserver-base-files/etc/group similarity index 100% rename from containers/ddev-webserver/files/etc/group rename to containers/ddev-webserver/ddev-webserver-base-files/etc/group diff --git a/containers/ddev-webserver/files/etc/nginx/monitoring.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/monitoring.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/monitoring.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/monitoring.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx-site-backdrop.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-backdrop.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx-site-backdrop.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-backdrop.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx-site-default.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-default.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx-site-default.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-default.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx-site-drupal6.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-drupal6.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx-site-drupal6.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-drupal6.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx-site-drupal7.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-drupal7.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx-site-drupal7.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-drupal7.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx-site-drupal8.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-drupal8.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx-site-drupal8.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-drupal8.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx-site-drupal9.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-drupal9.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx-site-drupal9.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-drupal9.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx-site-laravel.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-laravel.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx-site-laravel.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-laravel.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx-site-magento.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-magento.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx-site-magento.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-magento.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx-site-magento2.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-magento2.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx-site-magento2.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-magento2.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx-site-typo3.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-typo3.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx-site-typo3.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-typo3.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx-site-wordpress.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-wordpress.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx-site-wordpress.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx-site-wordpress.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx_backdrop.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_backdrop.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx_backdrop.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_backdrop.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx_default.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_default.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx_default.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_default.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx_drupal6.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_drupal6.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx_drupal6.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_drupal6.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx_drupal7.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_drupal7.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx_drupal7.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_drupal7.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx_drupal8.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_drupal8.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx_drupal8.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_drupal8.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx_drupal9.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_drupal9.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx_drupal9.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_drupal9.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx_laravel.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_laravel.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx_laravel.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_laravel.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx_magento.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_magento.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx_magento.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_magento.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx_magento2.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_magento2.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx_magento2.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_magento2.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx_typo3.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_typo3.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx_typo3.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_typo3.conf diff --git a/containers/ddev-webserver/files/etc/nginx/nginx_wordpress.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_wordpress.conf similarity index 100% rename from containers/ddev-webserver/files/etc/nginx/nginx_wordpress.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/nginx/nginx_wordpress.conf diff --git a/containers/ddev-webserver/files/etc/passwd b/containers/ddev-webserver/ddev-webserver-base-files/etc/passwd similarity index 100% rename from containers/ddev-webserver/files/etc/passwd rename to containers/ddev-webserver/ddev-webserver-base-files/etc/passwd diff --git a/containers/ddev-webserver/files/etc/php/5.6/apache2/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/apache2/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/5.6/apache2/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/apache2/php.ini diff --git a/containers/ddev-webserver/files/etc/php/5.6/cgi/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/cgi/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/5.6/cgi/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/cgi/php.ini diff --git a/containers/ddev-webserver/files/etc/php/5.6/cli/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/cli/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/5.6/cli/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/cli/php.ini diff --git a/containers/ddev-webserver/files/etc/php/5.6/fpm/php-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/fpm/php-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/php/5.6/fpm/php-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/fpm/php-fpm.conf diff --git a/containers/ddev-webserver/files/etc/php/5.6/fpm/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/fpm/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/5.6/fpm/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/fpm/php.ini diff --git a/containers/ddev-webserver/files/etc/php/5.6/fpm/pool.d/www.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/fpm/pool.d/www.conf similarity index 100% rename from containers/ddev-webserver/files/etc/php/5.6/fpm/pool.d/www.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/fpm/pool.d/www.conf diff --git a/containers/ddev-webserver/files/etc/php/5.6/mods-available/xdebug.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/mods-available/xdebug.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/5.6/mods-available/xdebug.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/5.6/mods-available/xdebug.ini diff --git a/containers/ddev-webserver/files/etc/php/7.0/apache2/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/apache2/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.0/apache2/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/apache2/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.0/cgi/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/cgi/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.0/cgi/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/cgi/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.0/cli/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/cli/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.0/cli/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/cli/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.0/fpm/php-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/fpm/php-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.0/fpm/php-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/fpm/php-fpm.conf diff --git a/containers/ddev-webserver/files/etc/php/7.0/fpm/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/fpm/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.0/fpm/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/fpm/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.0/fpm/pool.d/www.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/fpm/pool.d/www.conf similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.0/fpm/pool.d/www.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/fpm/pool.d/www.conf diff --git a/containers/ddev-webserver/files/etc/php/7.0/mods-available/xdebug.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/mods-available/xdebug.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.0/mods-available/xdebug.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.0/mods-available/xdebug.ini diff --git a/containers/ddev-webserver/files/etc/php/7.1/apache2/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/apache2/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.1/apache2/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/apache2/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.1/cgi/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/cgi/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.1/cgi/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/cgi/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.1/cli/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/cli/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.1/cli/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/cli/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.1/fpm/php-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/fpm/php-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.1/fpm/php-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/fpm/php-fpm.conf diff --git a/containers/ddev-webserver/files/etc/php/7.1/fpm/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/fpm/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.1/fpm/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/fpm/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.1/fpm/pool.d/www.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/fpm/pool.d/www.conf similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.1/fpm/pool.d/www.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/fpm/pool.d/www.conf diff --git a/containers/ddev-webserver/files/etc/php/7.1/mods-available/xdebug.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/mods-available/xdebug.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.1/mods-available/xdebug.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.1/mods-available/xdebug.ini diff --git a/containers/ddev-webserver/files/etc/php/7.2/apache2/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/apache2/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.2/apache2/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/apache2/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.2/cgi/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/cgi/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.2/cgi/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/cgi/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.2/cli/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/cli/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.2/cli/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/cli/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.2/fpm/php-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/fpm/php-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.2/fpm/php-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/fpm/php-fpm.conf diff --git a/containers/ddev-webserver/files/etc/php/7.2/fpm/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/fpm/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.2/fpm/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/fpm/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.2/fpm/pool.d/www.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/fpm/pool.d/www.conf similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.2/fpm/pool.d/www.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/fpm/pool.d/www.conf diff --git a/containers/ddev-webserver/files/etc/php/7.2/mods-available/xdebug.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/mods-available/xdebug.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.2/mods-available/xdebug.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.2/mods-available/xdebug.ini diff --git a/containers/ddev-webserver/files/etc/php/7.3/apache2/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/apache2/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.3/apache2/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/apache2/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.3/cgi/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/cgi/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.3/cgi/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/cgi/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.3/cli/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/cli/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.3/cli/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/cli/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.3/fpm/php-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/fpm/php-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.3/fpm/php-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/fpm/php-fpm.conf diff --git a/containers/ddev-webserver/files/etc/php/7.3/fpm/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/fpm/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.3/fpm/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/fpm/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.3/fpm/pool.d/www.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/fpm/pool.d/www.conf similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.3/fpm/pool.d/www.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/fpm/pool.d/www.conf diff --git a/containers/ddev-webserver/files/etc/php/7.3/mods-available/xdebug.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/mods-available/xdebug.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.3/mods-available/xdebug.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.3/mods-available/xdebug.ini diff --git a/containers/ddev-webserver/files/etc/php/7.4/apache2/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/apache2/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.4/apache2/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/apache2/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.4/cgi/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/cgi/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.4/cgi/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/cgi/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.4/cli/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/cli/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.4/cli/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/cli/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.4/fpm/php-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/fpm/php-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.4/fpm/php-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/fpm/php-fpm.conf diff --git a/containers/ddev-webserver/files/etc/php/7.4/fpm/php.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/fpm/php.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.4/fpm/php.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/fpm/php.ini diff --git a/containers/ddev-webserver/files/etc/php/7.4/fpm/pool.d/www.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/fpm/pool.d/www.conf similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.4/fpm/pool.d/www.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/fpm/pool.d/www.conf diff --git a/containers/ddev-webserver/files/etc/php/7.4/mods-available/xdebug.ini b/containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/mods-available/xdebug.ini similarity index 100% rename from containers/ddev-webserver/files/etc/php/7.4/mods-available/xdebug.ini rename to containers/ddev-webserver/ddev-webserver-base-files/etc/php/7.4/mods-available/xdebug.ini diff --git a/containers/ddev-webserver/files/etc/profile b/containers/ddev-webserver/ddev-webserver-base-files/etc/profile similarity index 100% rename from containers/ddev-webserver/files/etc/profile rename to containers/ddev-webserver/ddev-webserver-base-files/etc/profile diff --git a/containers/ddev-webserver/files/etc/skel/.bashrc b/containers/ddev-webserver/ddev-webserver-base-files/etc/skel/.bashrc similarity index 100% rename from containers/ddev-webserver/files/etc/skel/.bashrc rename to containers/ddev-webserver/ddev-webserver-base-files/etc/skel/.bashrc diff --git a/containers/ddev-webserver/files/etc/skel/.profile b/containers/ddev-webserver/ddev-webserver-base-files/etc/skel/.profile similarity index 100% rename from containers/ddev-webserver/files/etc/skel/.profile rename to containers/ddev-webserver/ddev-webserver-base-files/etc/skel/.profile diff --git a/containers/ddev-webserver/files/etc/sudoers.d/ddev b/containers/ddev-webserver/ddev-webserver-base-files/etc/sudoers.d/ddev similarity index 100% rename from containers/ddev-webserver/files/etc/sudoers.d/ddev rename to containers/ddev-webserver/ddev-webserver-base-files/etc/sudoers.d/ddev diff --git a/containers/ddev-webserver/files/etc/supervisor/apache.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/supervisor/apache.conf similarity index 100% rename from containers/ddev-webserver/files/etc/supervisor/apache.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/supervisor/apache.conf diff --git a/containers/ddev-webserver/files/etc/supervisor/conf.d/mailhog.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/supervisor/conf.d/mailhog.conf similarity index 100% rename from containers/ddev-webserver/files/etc/supervisor/conf.d/mailhog.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/supervisor/conf.d/mailhog.conf diff --git a/containers/ddev-webserver/files/etc/supervisor/conf.d/supervisor.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/supervisor/conf.d/supervisor.conf similarity index 100% rename from containers/ddev-webserver/files/etc/supervisor/conf.d/supervisor.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/supervisor/conf.d/supervisor.conf diff --git a/containers/ddev-webserver/files/etc/supervisor/php-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/supervisor/php-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/supervisor/php-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/supervisor/php-fpm.conf diff --git a/containers/ddev-webserver/files/etc/supervisor/supervisord-apache-cgi.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/supervisor/supervisord-apache-cgi.conf similarity index 100% rename from containers/ddev-webserver/files/etc/supervisor/supervisord-apache-cgi.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/supervisor/supervisord-apache-cgi.conf diff --git a/containers/ddev-webserver/files/etc/supervisor/supervisord-apache-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/supervisor/supervisord-apache-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/supervisor/supervisord-apache-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/supervisor/supervisord-apache-fpm.conf diff --git a/containers/ddev-webserver/files/etc/supervisor/supervisord-nginx-fpm.conf b/containers/ddev-webserver/ddev-webserver-base-files/etc/supervisor/supervisord-nginx-fpm.conf similarity index 100% rename from containers/ddev-webserver/files/etc/supervisor/supervisord-nginx-fpm.conf rename to containers/ddev-webserver/ddev-webserver-base-files/etc/supervisor/supervisord-nginx-fpm.conf diff --git a/containers/ddev-webserver/files/home/.composer/cache/.gitmanaged b/containers/ddev-webserver/ddev-webserver-base-files/home/.composer/cache/.gitmanaged similarity index 100% rename from containers/ddev-webserver/files/home/.composer/cache/.gitmanaged rename to containers/ddev-webserver/ddev-webserver-base-files/home/.composer/cache/.gitmanaged diff --git a/containers/ddev-webserver/files/home/.drush/.gitmanaged b/containers/ddev-webserver/ddev-webserver-base-files/home/.drush/.gitmanaged similarity index 100% rename from containers/ddev-webserver/files/home/.drush/.gitmanaged rename to containers/ddev-webserver/ddev-webserver-base-files/home/.drush/.gitmanaged diff --git a/containers/ddev-webserver/files/home/.gitconfig b/containers/ddev-webserver/ddev-webserver-base-files/home/.gitconfig similarity index 100% rename from containers/ddev-webserver/files/home/.gitconfig rename to containers/ddev-webserver/ddev-webserver-base-files/home/.gitconfig diff --git a/containers/ddev-webserver/files/home/.my.cnf b/containers/ddev-webserver/ddev-webserver-base-files/home/.my.cnf similarity index 100% rename from containers/ddev-webserver/files/home/.my.cnf rename to containers/ddev-webserver/ddev-webserver-base-files/home/.my.cnf diff --git a/containers/ddev-webserver/files/home/.ssh/config b/containers/ddev-webserver/ddev-webserver-base-files/home/.ssh/config similarity index 100% rename from containers/ddev-webserver/files/home/.ssh/config rename to containers/ddev-webserver/ddev-webserver-base-files/home/.ssh/config diff --git a/containers/ddev-webserver/files/usr/local/bin/disable_xdebug b/containers/ddev-webserver/ddev-webserver-base-files/usr/local/bin/disable_xdebug similarity index 100% rename from containers/ddev-webserver/files/usr/local/bin/disable_xdebug rename to containers/ddev-webserver/ddev-webserver-base-files/usr/local/bin/disable_xdebug diff --git a/containers/ddev-webserver/files/usr/local/bin/enable_xdebug b/containers/ddev-webserver/ddev-webserver-base-files/usr/local/bin/enable_xdebug similarity index 100% rename from containers/ddev-webserver/files/usr/local/bin/enable_xdebug rename to containers/ddev-webserver/ddev-webserver-base-files/usr/local/bin/enable_xdebug diff --git a/containers/ddev-webserver/files/usr/local/bin/kill_supervisor.py b/containers/ddev-webserver/ddev-webserver-base-files/usr/local/bin/kill_supervisor.py similarity index 100% rename from containers/ddev-webserver/files/usr/local/bin/kill_supervisor.py rename to containers/ddev-webserver/ddev-webserver-base-files/usr/local/bin/kill_supervisor.py diff --git a/containers/ddev-webserver/files/var/www/html/docroot/test/400.php b/containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/400.php similarity index 100% rename from containers/ddev-webserver/files/var/www/html/docroot/test/400.php rename to containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/400.php diff --git a/containers/ddev-webserver/files/var/www/html/docroot/test/401.php b/containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/401.php similarity index 100% rename from containers/ddev-webserver/files/var/www/html/docroot/test/401.php rename to containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/401.php diff --git a/containers/ddev-webserver/files/var/www/html/docroot/test/500.php b/containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/500.php similarity index 100% rename from containers/ddev-webserver/files/var/www/html/docroot/test/500.php rename to containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/500.php diff --git a/containers/ddev-webserver/files/var/www/html/docroot/test/fatal.php b/containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/fatal.php similarity index 100% rename from containers/ddev-webserver/files/var/www/html/docroot/test/fatal.php rename to containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/fatal.php diff --git a/containers/ddev-webserver/files/var/www/html/docroot/test/phptest.php b/containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/phptest.php similarity index 100% rename from containers/ddev-webserver/files/var/www/html/docroot/test/phptest.php rename to containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/phptest.php diff --git a/containers/ddev-webserver/files/var/www/html/docroot/test/test-email.php b/containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/test-email.php similarity index 100% rename from containers/ddev-webserver/files/var/www/html/docroot/test/test-email.php rename to containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/test-email.php diff --git a/containers/ddev-webserver/files/var/www/html/docroot/test/upstream-error.php b/containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/upstream-error.php similarity index 100% rename from containers/ddev-webserver/files/var/www/html/docroot/test/upstream-error.php rename to containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/upstream-error.php diff --git a/containers/ddev-webserver/files/var/www/html/docroot/test/xdebug.php b/containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/xdebug.php similarity index 100% rename from containers/ddev-webserver/files/var/www/html/docroot/test/xdebug.php rename to containers/ddev-webserver/ddev-webserver-base-files/var/www/html/docroot/test/xdebug.php diff --git a/containers/ddev-webserver/files/var/www/phpstatus.php b/containers/ddev-webserver/ddev-webserver-base-files/var/www/phpstatus.php similarity index 100% rename from containers/ddev-webserver/files/var/www/phpstatus.php rename to containers/ddev-webserver/ddev-webserver-base-files/var/www/phpstatus.php diff --git a/containers/ddev-webserver/scripts/healthcheck.sh b/containers/ddev-webserver/ddev-webserver-base-scripts/healthcheck.sh similarity index 100% rename from containers/ddev-webserver/scripts/healthcheck.sh rename to containers/ddev-webserver/ddev-webserver-base-scripts/healthcheck.sh diff --git a/containers/ddev-webserver/scripts/start.sh b/containers/ddev-webserver/ddev-webserver-base-scripts/start.sh similarity index 100% rename from containers/ddev-webserver/scripts/start.sh rename to containers/ddev-webserver/ddev-webserver-base-scripts/start.sh diff --git a/pkg/version/version.go b/pkg/version/version.go index 84b04cc41cd..c2355e3c980 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -45,7 +45,7 @@ var DockerComposeFileFormatVersion = "3.6" var WebImg = "drud/ddev-webserver" // WebTag defines the default web image tag for drud dev -var WebTag = "20200513_laravel" // Note that this can be overridden by make +var WebTag = "20200601_inherit_php_from_ddev_images" // Note that this can be overridden by make // DBImg defines the default db image used for applications. var DBImg = "drud/ddev-dbserver"