Update Composer, update everything
This commit is contained in:
parent
ea3e94409f
commit
dda5c284b6
19527 changed files with 1135420 additions and 351004 deletions
25
vendor/drupal/console/templates/files/.env.dist.twig
vendored
Normal file
25
vendor/drupal/console/templates/files/.env.dist.twig
vendored
Normal file
|
@ -0,0 +1,25 @@
|
|||
{{ yaml_comment('commands.dotenv.init.messages.template-env') }}
|
||||
|
||||
# ENV
|
||||
ENVIRONMENT={{ environment }}
|
||||
|
||||
# Database
|
||||
DATABASE_NAME={{ database_name }}
|
||||
DATABASE_USER={{ database_user }}
|
||||
DATABASE_PASSWORD={{ database_password }}
|
||||
DATABASE_HOST={{ database_host }}
|
||||
DATABASE_PORT={{ database_port }}
|
||||
|
||||
# HOST
|
||||
HOST_NAME={{ host_name }}
|
||||
HOST_PORT={{ host_port }}
|
||||
|
||||
# Default values for drupal-composer
|
||||
DRUPAL_ROOT={{ drupal_root }}
|
||||
SERVER_ROOT={{ server_root }}
|
||||
|
||||
{% if load_settings is defined %}
|
||||
# SETTINGS
|
||||
SETTINGS_BAR=baz
|
||||
SETTINGS_LOREM=ipsum
|
||||
{% endif %}
|
7
vendor/drupal/console/templates/files/.gitignore.dist
vendored
Normal file
7
vendor/drupal/console/templates/files/.gitignore.dist
vendored
Normal file
|
@ -0,0 +1,7 @@
|
|||
|
||||
# dotenv file
|
||||
.env
|
||||
|
||||
# backup files
|
||||
*.original
|
||||
*.backup
|
73
vendor/drupal/console/templates/files/docker-compose.yml.twig
vendored
Normal file
73
vendor/drupal/console/templates/files/docker-compose.yml.twig
vendored
Normal file
|
@ -0,0 +1,73 @@
|
|||
version: "2.3"
|
||||
|
||||
services:
|
||||
mariadb:
|
||||
image: wodby/mariadb:10.2-3.0.2
|
||||
env_file: ./.env
|
||||
environment:
|
||||
MYSQL_RANDOM_ROOT_PASSWORD: 'true'
|
||||
MYSQL_DATABASE: ${DATABASE_NAME}
|
||||
MYSQL_USER: ${DATABASE_USER}
|
||||
MYSQL_PASSWORD: ${DATABASE_PASSWORD}
|
||||
volumes:
|
||||
- mysqldata:/var/lib/mysql
|
||||
# Uncomment next line and place DDb dump.sql file(s) here
|
||||
# - ./mariadb-init:/docker-entrypoint-initdb.d
|
||||
healthcheck:
|
||||
test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
|
||||
timeout: 20s
|
||||
retries: 10
|
||||
|
||||
php:
|
||||
image: wodby/drupal-php:7.0-2.4.3
|
||||
env_file: ./.env
|
||||
environment:
|
||||
PHP_SENDMAIL_PATH: /usr/sbin/sendmail -t -i -S mailhog:1025
|
||||
DB_HOST: ${DATABASE_HOST}
|
||||
DB_USER: ${DATABASE_USER}
|
||||
DB_PASSWORD: ${DATABASE_PASSWORD}
|
||||
DB_NAME: ${DATABASE_NAME}
|
||||
DB_DRIVER: mysql
|
||||
volumes:
|
||||
- ./:${DRUPAL_ROOT}{{ volume_configuration }}
|
||||
depends_on:
|
||||
mariadb:
|
||||
condition: service_healthy
|
||||
|
||||
nginx:
|
||||
image: wodby/drupal-nginx:8-1.13-2.4.2
|
||||
env_file: ./.env
|
||||
depends_on:
|
||||
- php
|
||||
environment:
|
||||
NGINX_STATIC_CONTENT_OPEN_FILE_CACHE: "off"
|
||||
NGINX_ERROR_LOG_LEVEL: debug
|
||||
NGINX_BACKEND_HOST: php
|
||||
NGINX_SERVER_ROOT: ${SERVER_ROOT}
|
||||
volumes:
|
||||
- ./:${DRUPAL_ROOT}{{ volume_configuration }}
|
||||
labels:
|
||||
- 'traefik.backend=nginx'
|
||||
- 'traefik.port=80'
|
||||
- 'traefik.frontend.rule=Host:${HOST_NAME}'
|
||||
|
||||
mailhog:
|
||||
image: mailhog/mailhog
|
||||
env_file: ./.env
|
||||
labels:
|
||||
- 'traefik.backend=mailhog'
|
||||
- 'traefik.port=8025'
|
||||
- 'traefik.frontend.rule=Host:mailhog.${HOST_NAME}'
|
||||
|
||||
traefik:
|
||||
image: traefik
|
||||
env_file: ./.env
|
||||
command: -c /dev/null --web --docker --logLevel=INFO
|
||||
ports:
|
||||
- '${HOST_PORT}:80'
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
|
||||
volumes:
|
||||
mysqldata:
|
||||
driver: "local"
|
34
vendor/drupal/console/templates/files/settings.php.twig
vendored
Normal file
34
vendor/drupal/console/templates/files/settings.php.twig
vendored
Normal file
|
@ -0,0 +1,34 @@
|
|||
{% if load_from_env is defined %}
|
||||
{{ yaml_comment('commands.dotenv.init.messages.load-from-env') }}
|
||||
{% endif %}
|
||||
|
||||
# Load environment
|
||||
$env = getenv('ENVIRONMENT');
|
||||
|
||||
{% if load_settings is defined %}
|
||||
{{ yaml_comment('commands.dotenv.init.messages.load-settings') }}
|
||||
{% endif %}
|
||||
$base_path = $app_root . '/' . $site_path;
|
||||
$servicesFile = $base_path . '/services.'.$env.'.yml';
|
||||
$settingsFile = $base_path . '/settings.'.$env.'.php';
|
||||
|
||||
// Load services definition file.
|
||||
if (file_exists($servicesFile)) {
|
||||
$settings['container_yamls'][] = $servicesFile;
|
||||
}
|
||||
|
||||
// Load settings file.
|
||||
if (file_exists($settingsFile)) {
|
||||
include $settingsFile;
|
||||
}
|
||||
|
||||
$databases['default']['default'] = array (
|
||||
'database' => getenv('DATABASE_NAME'),
|
||||
'username' => getenv('DATABASE_USER'),
|
||||
'password' => getenv('DATABASE_PASSWORD'),
|
||||
'prefix' => '',
|
||||
'host' => getenv('DATABASE_HOST'),
|
||||
'port' => getenv('DATABASE_PORT'),
|
||||
'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
|
||||
'driver' => 'mysql',
|
||||
);
|
Reference in a new issue