Skip to content

Commit

Permalink
[TASK] Streamline development environment
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaminkott committed Mar 10, 2019
1 parent 8a02a62 commit c8448d4
Show file tree
Hide file tree
Showing 9 changed files with 140 additions and 1,498 deletions.
8 changes: 8 additions & 0 deletions .ddev/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#ddev-generated: Automatically generated ddev .gitignore.

/import.yaml
/docker-compose.yaml
/db_snapshots
/sequelpro.spf
/import-db
/.bgsync*
92 changes: 92 additions & 0 deletions .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
APIVersion: v1.6.0
name: bootstrap-package
type: typo3
docroot: .build/web
php_version: "7.2"
webserver_type: apache-fpm
router_http_port: "80"
router_https_port: "443"
xdebug_enabled: true
additional_hostnames: []
additional_fqdns: []
mariadb_version: "10.2"
webcache_enabled: false
nfs_mount_enabled: false
provider: default


# This config.yaml was created with ddev version v1.6.0
# webimage: drud/ddev-webserver:v1.6.0
# dbimage: drud/ddev-dbserver:v1.6.0-10.2
# dbaimage: drud/phpmyadmin:v1.6.0
# bgsyncimage: drud/ddev-bgsync:v1.6.0
# However we do not recommend explicitly wiring these images into the
# config.yaml as they may break future versions of ddev.
# You can update this config.yaml using 'ddev config'.

# Key features of ddev's config.yaml:

# name: <projectname> # Name of the project, automatically provides
# http://projectname.ddev.local and https://projectname.ddev.local

# type: <projecttype> # drupal6/7/8, backdrop, typo3, wordpress, php

# docroot: <relative_path> # Relative path to the directory containing index.php.

# php_version: "7.1" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3"

# You can explicitly specify the webimage, dbimage, dbaimage lines but this
# is not recommended, as the images are often closely tied to ddev's' behavior,
# so this can break upgrades.

# webimage: <docker_image> # nginx/php docker image.
# dbimage: <docker_image> # mariadb docker image.
# dbaimage: <docker_image>
# bgsyncimage: <docker_image>

# router_http_port: <port> # Port to be used for http (defaults to port 80)
# router_https_port: <port> # Port for https (defaults to 443)

# xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart"

# webserver_type: nginx-fpm # Can be set to apache-fpm or apache-cgi as well

# additional_hostnames:
# - somename
# - someothername
# would provide http and https URLs for "somename.ddev.local"
# and "someothername.ddev.local".

# additional_fqdns:
# - example.com
# - sub1.example.com
# would provide http and https URLs for "example.com" and "sub1.example.com"
# Please take care with this because it can cause great confusion.

# upload_dir: custom/upload/dir
# would set the destination path for ddev import-files to custom/upload/dir.

# working_dir:
# web: /var/www/html
# db: /home
# would set the default working directory for the web and db services.
# These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run.

# omit_containers: ["dba", "ddev-ssh-agent"]
# would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently
# only those two containers can be omitted here.
# Note that these containers can also be omitted globally in the
# ~/.ddev/global_config.yaml or with the "ddev config global" command.


# provider: default # Currently either "default" or "pantheon"
#
# Many ddev commands can be extended to run tasks after the ddev command is
# executed.
# See https://ddev.readthedocs.io/en/stable/users/extending-commands/ for more
# information on the commands that can be extended and the tasks you can define
# for them. Example:
#hooks:
# post-start:
# - exec: composer install -d /var/www/html
6 changes: 6 additions & 0 deletions .ddev/docker-compose.environment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: '3.6'

services:
web:
environment:
- TYPO3_CONTEXT=Development
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Folders
/.ddev export-ignore
/.github export-ignore
/.vscode export-ignore
/Build export-ignore

# Files
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.build
.vscode
Build/bower_components/*
Build/node_modules/*
composer.lock
.php_cs.cache
nbproject
config
var
14 changes: 14 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "DDEV",
"type": "php",
"request": "launch",
"port": 9000,
"pathMappings": {
"/var/www/html": "${workspaceRoot}"
}
}
]
}
1,487 changes: 0 additions & 1,487 deletions Documentation/AdministratorManual/ChangeLog/Index.rst

This file was deleted.

14 changes: 8 additions & 6 deletions Documentation/AdministratorManual/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ Administrator manual

.. only:: html

This chapter describes how to manage the extension from a superuser point of view.
This chapter describes how to manage the extension from a superuser point of view.

For a complete changelog please see the release notes on `GitHub <https://github.com/benjaminkott/bootstrap_package/releases/>`_.


.. toctree::
:maxdepth: 5
:titlesonly:
:maxdepth: 5
:titlesonly:

Migration/6-2-14
Migration/6-2-11
ChangeLog/Index
Migration/6-2-14
Migration/6-2-11
11 changes: 8 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,13 @@
"typo3/cms-rte-ckeditor": "^8.7.0 || ^9.0"
},
"require-dev": {
"typo3/cms-felogin": "^8.7.0 || ^9.0",
"typo3/cms-form": "^8.7.0 || ^9.0",
"typo3/cms-indexed-search": "^8.7.0 || ^9.0",
"typo3/cms-tstemplate": "^8.7.0 || ^9.0",
"friendsofphp/php-cs-fixer": "^2.3.1",
"typo3/testing-framework": "^1.2 || ^4.9"
"typo3/testing-framework": "^1.2 || ^4.9",
"bk2k/extension-helper": "^1.0"
},
"autoload": {
"psr-4": {
Expand All @@ -66,10 +71,10 @@
"@test:php:unit"
],
"set-version": [
"BK2K\\BootstrapPackage\\Composer\\VersionScript::setVersion"
"extension-helper version:set"
],
"changelog": [
"BK2K\\BootstrapPackage\\Composer\\ChangelogScript::generateChangelog"
"extension-helper changelog:create"
],
"post-autoload-dump": [
"mkdir -p .build/web/typo3conf/ext/",
Expand Down

0 comments on commit c8448d4

Please sign in to comment.