Refine ddev config and htaccess once more, update .gitignore
This commit is contained in:
Björn Fromme
@@ -1,9 +0,0 @@
|
||||
|
||||
ARG BASE_IMAGE
|
||||
FROM $BASE_IMAGE
|
||||
|
||||
ARG username
|
||||
ARG uid
|
||||
ARG gid
|
||||
RUN (groupadd --gid $gid "$username" || groupadd "$username" || true) && (useradd -l -m -s "/bin/bash" --gid "$username" --comment '' --uid $uid "$username" || useradd -l -m -s "/bin/bash" --gid "$username" --comment '' "$username")
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
#ddev-generated: Automatically generated ddev .gitignore.
|
||||
# You can remove the above line if you want to edit and maintain this file yourself.
|
||||
|
||||
/commands/*/*.example
|
||||
/commands/*/README.txt
|
||||
/commands/host/launch
|
||||
/commands/db/mysql
|
||||
/homeadditions/*.example
|
||||
/homeadditions/README.txt
|
||||
/.gitignore
|
||||
/import.yaml
|
||||
/docker-compose.yaml
|
||||
/db_snapshots
|
||||
/sequelpro.spf
|
||||
/import-db
|
||||
/.bgsync*
|
||||
/config.*.y*ml
|
||||
/.webimageBuild
|
||||
/.dbimageBuild
|
||||
/.bgsyncimageBuild
|
||||
/.sshimageBuild
|
||||
/.webimageExtra
|
||||
/.dbimageExtra
|
||||
/*-build/Dockerfile.example
|
||||
@@ -1,9 +0,0 @@
|
||||
|
||||
ARG BASE_IMAGE
|
||||
FROM $BASE_IMAGE
|
||||
|
||||
ARG username
|
||||
ARG uid
|
||||
ARG gid
|
||||
RUN (groupadd --gid $gid "$username" || groupadd "$username" || true) && (useradd -l -m -s "/bin/bash" --gid "$username" --comment '' --uid $uid "$username" || useradd -l -m -s "/bin/bash" --gid "$username" --comment '' "$username")
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
|
||||
ARG BASE_IMAGE
|
||||
FROM $BASE_IMAGE
|
||||
|
||||
ARG username
|
||||
ARG uid
|
||||
ARG gid
|
||||
RUN (groupadd --gid $gid "$username" || groupadd "$username" || true) && (useradd -l -m -s "/bin/bash" --gid "$username" --comment '' --uid $uid "$username" || useradd -l -m -s "/bin/bash" --gid "$username" --comment '' "$username")
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
Scripts in this directory will be executed inside the db
|
||||
container. A number of environment variables are supplied to the scripts, including:
|
||||
|
||||
DDEV_APPROOT: file system location of the project on the host)
|
||||
DDEV_HOST_DB_PORT: Localhost port of the database server
|
||||
DDEV_HOST_WEBSERVER_PORT: Localhost port of the webserver
|
||||
DDEV_HOST_HTTPS_PORT: Localhost port for https on webserver
|
||||
DDEV_DOCROOT: Relative path from approot to docroot
|
||||
DDEV_HOSTNAME: Comma-separated list of FQDN hostnames
|
||||
DDEV_PHP_VERSION
|
||||
DDEV_WEBSERVER_TYPE: nginx-fpm, apache-fpm, apache-cgi
|
||||
DDEV_PROJECT_TYPE: drupal8, typo3, backdrop, wordpress, etc.
|
||||
DDEV_ROUTER_HTTP_PORT: Router port for http
|
||||
DDEV_ROUTER_HTTPS_PORT: Router port for https
|
||||
|
||||
More environment variables may be available, see https://github.com/drud/ddev/blob/52c7915dee41d4846f9f619520b726994c0372c5/pkg/ddevapp/ddevapp.go#L1006-L1030
|
||||
@@ -1,9 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
## #ddev-generated
|
||||
## Description: run mysql client in db container
|
||||
## Usage: mysql [flags] [args]
|
||||
## Example: "ddev mysql" or "ddev mysql -uroot -proot" or "echo 'SHOW TABLES;' | ddev mysql"
|
||||
## `ddev mysql --database=mysql -uroot -proot` gets you to the 'mysql' database with root privileges
|
||||
|
||||
mysql -udb -pdb $@
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
## #ddev-generated
|
||||
## Description: run mysqldump in web container
|
||||
## Usage: mysqldump [flags] [args]
|
||||
## Example: "ddev mysqldump db" or "ddev mysqldump otherdb" or "ddev mysqldump db | gzip >db.sql.gz"
|
||||
|
||||
mysqldump -uroot -proot $@
|
||||
@@ -1,18 +0,0 @@
|
||||
Scripts in this directory will be executed on the host
|
||||
but they can take easily take action on containers by using
|
||||
`ddev exec`. A number of environment variables are supplied to the scripts
|
||||
including:
|
||||
|
||||
DDEV_APPROOT: file system location of the project on the host)
|
||||
DDEV_HOST_DB_PORT: Localhost port of the database server
|
||||
DDEV_HOST_WEBSERVER_PORT: Localhost port of the webserver
|
||||
DDEV_HOST_HTTPS_PORT: Localhost port for https on webserver
|
||||
DDEV_DOCROOT: Relative path from approot to docroot
|
||||
DDEV_HOSTNAME: Comma-separated list of FQDN hostnames
|
||||
DDEV_PHP_VERSION
|
||||
DDEV_WEBSERVER_TYPE: nginx-fpm, apache-fpm, apache-cgi
|
||||
DDEV_PROJECT_TYPE: drupal8, typo3, backdrop, wordpress, etc.
|
||||
DDEV_ROUTER_HTTP_PORT: Router port for http
|
||||
DDEV_ROUTER_HTTPS_PORT: Router port for https
|
||||
|
||||
More environment variables may be available, see https://github.com/drud/ddev/blob/52c7915dee41d4846f9f619520b726994c0372c5/pkg/ddevapp/ddevapp.go#L1006-L1030
|
||||
@@ -1,28 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
## #ddev-generated
|
||||
## Description: Launch a browser with the current site
|
||||
## Usage: launch [path]
|
||||
## Example: "ddev launch" or "ddev launch /admin/reports/status/php" or "ddev launch phpinfo.php"
|
||||
|
||||
FULLURL=${DDEV_PRIMARY_URL}
|
||||
|
||||
if [ -n "${1:-}" ] ; then
|
||||
if [[ ${1::1} != "/" ]] ; then
|
||||
FULLURL="${FULLURL}/";
|
||||
fi
|
||||
|
||||
FULLURL="${FULLURL}${1}";
|
||||
fi
|
||||
|
||||
case $OSTYPE in
|
||||
linux-gnu)
|
||||
xdg-open ${FULLURL}
|
||||
;;
|
||||
"darwin"*)
|
||||
open ${FULLURL}
|
||||
;;
|
||||
"win*"* | "msys"*)
|
||||
start ${FULLURL}
|
||||
;;
|
||||
esac
|
||||
@@ -1,32 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
## #ddev-generated
|
||||
## Description: Run MySQLWorkbench against current db
|
||||
## Usage: mysqlworkbench
|
||||
## Example: "ddev mysqlworkbench"
|
||||
|
||||
# Note that this examle uses $DDEV_HOST_DB_PORT to get the port for the connection
|
||||
# Mysql Workbench can be obtained from https://dev.mysql.com/downloads/workbench/
|
||||
|
||||
query="root:[email protected]:${DDEV_HOST_DB_PORT}"
|
||||
|
||||
case $OSTYPE in
|
||||
linux-gnu)
|
||||
# You may need "apt-get install libproj-dev gnome-keyring" if it complains about those
|
||||
mysql-workbench --query "$query" &
|
||||
echo "Attempted to launch mysql-workbench"
|
||||
;;
|
||||
|
||||
"darwin"*)
|
||||
"/Applications/MySQLWorkbench.app/Contents/MacOS/MySQLWorkbench" --query "$query" &
|
||||
echo "Attempted to launch MySQLWorkbench.app"
|
||||
;;
|
||||
|
||||
"win*"* | "msys"*)
|
||||
# 'C:\Program Files\MySQL\MySQL Workbench 8.0 CE\mysqlworkbench.exe'
|
||||
# You may need to add it to your system %PATH% or change the path here
|
||||
# On docker toolbox you'll need to change the query to use the toolbox IP address,
|
||||
# likely 192.168.99.100
|
||||
'C:\Program Files\MySQL\MySQL Workbench 8.0 CE\mysqlworkbench.exe' --query "$query"
|
||||
#;;
|
||||
esac
|
||||
@@ -1,9 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
## #ddev-generated
|
||||
## Description: Open PHPStorm with the current project
|
||||
## Usage: phpstorm
|
||||
## Example: "ddev phpstorm"
|
||||
|
||||
# Example is macOS-specific, but easy to adapt to any OS
|
||||
open -a PHPStorm.app ${DDEV_APPROOT}
|
||||
@@ -1,11 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
## #ddev-generated
|
||||
## Description: Tail the main solr log
|
||||
## Usage: solrtail
|
||||
## Example: ddev solrtail
|
||||
|
||||
# This can't work unless you have a solr service,
|
||||
# See https://ddev.readthedocs.io/en/stable/users/extend/additional-services/#apache-solr
|
||||
|
||||
ddev exec -s solr tail -40lf /opt/solr/server/logs/solr.log
|
||||
@@ -1,24 +0,0 @@
|
||||
Scripts in this directory will be executed inside the solr
|
||||
container (if it exists, of course). This is just an example,
|
||||
but any named service can have a directory with commands.
|
||||
|
||||
Note that /mnt/ddev_config must be mounted into the 3rd-party service
|
||||
with a stanza like this in the docker-compose.solr.yaml:
|
||||
|
||||
volumes:
|
||||
- type: "bind"
|
||||
source: "."
|
||||
target: "/mnt/ddev_config"
|
||||
|
||||
|
||||
A number of environment variables are supplied to the scripts, including:
|
||||
|
||||
DDEV_DOCROOT: Relative path from approot to docroot
|
||||
DDEV_HOSTNAME: Comma-separated list of FQDN hostnames
|
||||
DDEV_PHP_VERSION
|
||||
DDEV_WEBSERVER_TYPE: nginx-fpm, apache-fpm, apache-cgi
|
||||
DDEV_PROJECT_TYPE: drupal8, typo3, backdrop, wordpress, etc.
|
||||
DDEV_ROUTER_HTTP_PORT: Router port for http
|
||||
DDEV_ROUTER_HTTPS_PORT: Router port for https
|
||||
|
||||
More environment variables may be available, see https://github.com/drud/ddev/blob/52c7915dee41d4846f9f619520b726994c0372c5/pkg/ddevapp/ddevapp.go#L1006-L1030
|
||||
@@ -1,13 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
## #ddev-generated
|
||||
## Description: Tail the main solr log
|
||||
## Usage: solrtail
|
||||
## Example: ddev solrtail
|
||||
|
||||
# This example runs inside the solr container.
|
||||
# Note that this requires that /mnt/ddev_config be mounted
|
||||
# into the solr container and of course that you have a container
|
||||
# named solr.
|
||||
|
||||
tail -f /opt/solr/server/logs/solr.log
|
||||
@@ -1,20 +0,0 @@
|
||||
Scripts in this directory will be executed inside the web
|
||||
container. You can copy the example file or just rename it:
|
||||
`mv drush.example drush`, for example, and it will become
|
||||
a live command.
|
||||
|
||||
A number of environment variables are supplied to the scripts, including:
|
||||
|
||||
DDEV_APPROOT: file system location of the project on the host)
|
||||
DDEV_HOST_DB_PORT: Localhost port of the database server
|
||||
DDEV_HOST_WEBSERVER_PORT: Localhost port of the webserver
|
||||
DDEV_HOST_HTTPS_PORT: Localhost port for https on webserver
|
||||
DDEV_DOCROOT: Relative path from approot to docroot
|
||||
DDEV_HOSTNAME: Comma-separated list of FQDN hostnames
|
||||
DDEV_PHP_VERSION
|
||||
DDEV_WEBSERVER_TYPE: nginx-fpm, apache-fpm, apache-cgi
|
||||
DDEV_PROJECT_TYPE: drupal8, typo3, backdrop, wordpress, etc.
|
||||
DDEV_ROUTER_HTTP_PORT: Router port for http
|
||||
DDEV_ROUTER_HTTPS_PORT: Router port for https
|
||||
|
||||
More environment variables may be available, see https://github.com/drud/ddev/blob/52c7915dee41d4846f9f619520b726994c0372c5/pkg/ddevapp/ddevapp.go#L1006-L1030
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
## #ddev-generated
|
||||
## Description: Run drush inside the web container
|
||||
## Usage: drush [flags] [args]
|
||||
## Example: "ddev drush uli" or "ddev drush sql-cli" or "ddev drush --version"
|
||||
|
||||
drush $@
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
## #ddev-generated
|
||||
## Description: Reload config for nginx and php-fpm inside web container
|
||||
## Usage: restart-nginx
|
||||
## Example: "ddev restart-nginx"
|
||||
|
||||
killall -HUP nginx php-fpm
|
||||
+6
-6
@@ -8,12 +8,12 @@ router_http_port: "80"
|
||||
router_https_port: "443"
|
||||
xdebug_enabled: false
|
||||
additional_hostnames:
|
||||
- ep-events
|
||||
- ski-boarderweek
|
||||
- snowzone
|
||||
- unichamp
|
||||
- ski-wochenenden
|
||||
- schnee-event
|
||||
- ep-events
|
||||
- ski-boarderweek
|
||||
- snowzone
|
||||
- unichamp
|
||||
- ski-wochenenden
|
||||
- schnee-event
|
||||
additional_fqdns: []
|
||||
nfs_mount_enabled: true
|
||||
provider: default
|
||||
|
||||
@@ -1,182 +0,0 @@
|
||||
version: '3.6'
|
||||
#ddev-generated
|
||||
services:
|
||||
|
||||
db:
|
||||
container_name: ddev-${DDEV_SITENAME}-db
|
||||
build:
|
||||
context: '/Users/fromme/www/ep-reisen/.ddev/.dbimageBuild'
|
||||
args:
|
||||
BASE_IMAGE: $DDEV_DBIMAGE
|
||||
username: 'fromme'
|
||||
uid: '501'
|
||||
gid: '20'
|
||||
image: ${DDEV_DBIMAGE}-built
|
||||
stop_grace_period: 60s
|
||||
volumes:
|
||||
- type: "volume"
|
||||
source: mariadb-database
|
||||
target: "/var/lib/mysql"
|
||||
volume:
|
||||
nocopy: true
|
||||
- type: "bind"
|
||||
source: "."
|
||||
target: "/mnt/ddev_config"
|
||||
- ddev-global-cache:/mnt/ddev-global-cache
|
||||
restart: "no"
|
||||
user: "$DDEV_UID:$DDEV_GID"
|
||||
hostname: ep-reisen-db
|
||||
ports:
|
||||
- "127.0.0.1:$DDEV_HOST_DB_PORT:3306"
|
||||
labels:
|
||||
com.ddev.site-name: ${DDEV_SITENAME}
|
||||
com.ddev.platform: ddev
|
||||
com.ddev.app-type: typo3
|
||||
com.ddev.approot: $DDEV_APPROOT
|
||||
environment:
|
||||
- COLUMNS=$COLUMNS
|
||||
- LINES=$LINES
|
||||
- TZ=Europe/Berlin
|
||||
- DDEV_PROJECT=ep-reisen
|
||||
command: "$DDEV_MARIADB_LOCAL_COMMAND"
|
||||
healthcheck:
|
||||
interval: 1s
|
||||
retries: 30
|
||||
start_period: 20s
|
||||
timeout: 120s
|
||||
|
||||
web:
|
||||
container_name: ddev-${DDEV_SITENAME}-web
|
||||
build:
|
||||
context: '/Users/fromme/www/ep-reisen/.ddev/.webimageBuild'
|
||||
args:
|
||||
BASE_IMAGE: $DDEV_WEBIMAGE
|
||||
username: 'fromme'
|
||||
uid: '501'
|
||||
gid: '20'
|
||||
image: ${DDEV_WEBIMAGE}-built
|
||||
cap_add:
|
||||
- SYS_PTRACE
|
||||
volumes:
|
||||
- type: volume
|
||||
source: nfsmount
|
||||
target: /var/www/html
|
||||
|
||||
volume:
|
||||
nocopy: true
|
||||
|
||||
- ".:/mnt/ddev_config:ro"
|
||||
- ddev-global-cache:/mnt/ddev-global-cache
|
||||
|
||||
- ddev-ssh-agent_socket_dir:/home/.ssh-agent
|
||||
|
||||
|
||||
restart: "no"
|
||||
user: "$DDEV_UID:$DDEV_GID"
|
||||
hostname: ep-reisen-web
|
||||
|
||||
links:
|
||||
- db:db
|
||||
|
||||
# ports is list of exposed *container* ports
|
||||
ports:
|
||||
- "127.0.0.1:$DDEV_HOST_WEBSERVER_PORT:80"
|
||||
- "127.0.0.1:$DDEV_HOST_HTTPS_PORT:443"
|
||||
environment:
|
||||
- DOCROOT=$DDEV_DOCROOT
|
||||
- DDEV_PHP_VERSION=$DDEV_PHP_VERSION
|
||||
- DDEV_WEBSERVER_TYPE=$DDEV_WEBSERVER_TYPE
|
||||
- DDEV_PROJECT_TYPE=$DDEV_PROJECT_TYPE
|
||||
- DDEV_ROUTER_HTTP_PORT=$DDEV_ROUTER_HTTP_PORT
|
||||
- DDEV_ROUTER_HTTPS_PORT=$DDEV_ROUTER_HTTPS_PORT
|
||||
- DDEV_XDEBUG_ENABLED=$DDEV_XDEBUG_ENABLED
|
||||
- DOCKER_IP=127.0.0.1
|
||||
- HOST_DOCKER_INTERNAL_IP=
|
||||
- DEPLOY_NAME=local
|
||||
- VIRTUAL_HOST=$DDEV_HOSTNAME
|
||||
- COLUMNS=$COLUMNS
|
||||
- LINES=$LINES
|
||||
- TZ=Europe/Berlin
|
||||
# HTTP_EXPOSE allows for ports accepting HTTP traffic to be accessible from <site>.ddev.site:<port>
|
||||
# To expose a container port to a different host port, define the port as hostPort:containerPort
|
||||
- HTTP_EXPOSE=${DDEV_ROUTER_HTTP_PORT}:80,${DDEV_MAILHOG_PORT}:8025
|
||||
# You can optionally expose an HTTPS port option for any ports defined in HTTP_EXPOSE.
|
||||
# To expose an HTTPS port, define the port as securePort:containerPort.
|
||||
- HTTPS_EXPOSE=${DDEV_ROUTER_HTTPS_PORT}:80
|
||||
- SSH_AUTH_SOCK=/home/.ssh-agent/socket
|
||||
- DDEV_PROJECT=ep-reisen
|
||||
labels:
|
||||
com.ddev.site-name: ${DDEV_SITENAME}
|
||||
com.ddev.platform: ddev
|
||||
com.ddev.app-type: typo3
|
||||
com.ddev.approot: $DDEV_APPROOT
|
||||
|
||||
external_links:
|
||||
- "ddev-router:ep-events.ddev.site"
|
||||
- "ddev-router:ep-reisen.ddev.site"
|
||||
- "ddev-router:schnee-event.ddev.site"
|
||||
- "ddev-router:ski-boarderweek.ddev.site"
|
||||
- "ddev-router:ski-wochenenden.ddev.site"
|
||||
- "ddev-router:snowzone.ddev.site"
|
||||
- "ddev-router:unichamp.ddev.site"
|
||||
|
||||
healthcheck:
|
||||
interval: 1s
|
||||
retries: 10
|
||||
start_period: 10s
|
||||
timeout: 120s
|
||||
|
||||
|
||||
|
||||
dba:
|
||||
container_name: ddev-${DDEV_SITENAME}-dba
|
||||
image: $DDEV_DBAIMAGE
|
||||
restart: "no"
|
||||
labels:
|
||||
com.ddev.site-name: ${DDEV_SITENAME}
|
||||
com.ddev.platform: ddev
|
||||
com.ddev.app-type: typo3
|
||||
com.ddev.approot: $DDEV_APPROOT
|
||||
links:
|
||||
- db:db
|
||||
ports:
|
||||
- "80"
|
||||
hostname: ep-reisen-dba
|
||||
environment:
|
||||
- PMA_USER=db
|
||||
- PMA_PASSWORD=db
|
||||
- VIRTUAL_HOST=$DDEV_HOSTNAME
|
||||
- TZ=Europe/Berlin
|
||||
# HTTP_EXPOSE allows for ports accepting HTTP traffic to be accessible from <site>.ddev.site:<port>
|
||||
- HTTP_EXPOSE=${DDEV_PHPMYADMIN_PORT}:8036
|
||||
healthcheck:
|
||||
interval: 120s
|
||||
timeout: 2s
|
||||
retries: 1
|
||||
|
||||
networks:
|
||||
default:
|
||||
external:
|
||||
name: ddev_default
|
||||
volumes:
|
||||
|
||||
mariadb-database:
|
||||
name: "${DDEV_SITENAME}-mariadb"
|
||||
|
||||
|
||||
ddev-ssh-agent_socket_dir:
|
||||
external: true
|
||||
|
||||
ddev-global-cache:
|
||||
name: ddev-global-cache
|
||||
|
||||
|
||||
nfsmount:
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: nfs
|
||||
o: "addr=host.docker.internal,hard,nolock,rw"
|
||||
device: ":/Users/fromme/www/ep-reisen"
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user