Skip to content

Commit

Permalink
Merge branch 'shopware6' into develop for #169
Browse files Browse the repository at this point in the history
  • Loading branch information
davidalger committed Jun 22, 2020
2 parents 7af516a + 0681227 commit a067969
Show file tree
Hide file tree
Showing 7 changed files with 88 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* Updated `env-init` command to prompt user before overwriting an existing `.env` file in a project directory ([#166](https://github.com/davidalger/warden/pull/166) by @Lunaetic)
* Updated `env-init` command to prompt user for required arguments when missing ([#170](https://github.com/davidalger/warden/pull/170) by @Lunaetic)
* Added support for Magepack advanced JS bundling ([#138](https://github.com/davidalger/warden/pull/138) by @vbuck)
* Added a new `shopware6` environment type including Mutagen configuration for file sync on macOS (issue [#169](https://github.com/davidalger/warden/issues/169))

**Bug Fixes:**

Expand Down
14 changes: 14 additions & 0 deletions commands/env-init.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,20 @@ if [[ "${WARDEN_ENV_TYPE}" == "laravel" ]]; then
EOT
fi

if [[ "${WARDEN_ENV_TYPE}" == "shopware" ]]; then
cat >> "${WARDEN_ENV_PATH}/.env" <<-EOT
MARIADB_VERSION=10.4
NODE_VERSION=10
PHP_VERSION=7.4
REDIS_VERSION=5.0
WARDEN_DB=1
WARDEN_REDIS=1
WARDEN_MAILHOG=1
EOT
fi

if [[ "${WARDEN_ENV_TYPE}" == "symfony" ]]; then
cat >> "${WARDEN_ENV_PATH}/.env" <<-EOT
Expand Down
6 changes: 6 additions & 0 deletions environments/shopware/shopware.base.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: "3.5"
services:
nginx:
environment:
- NGINX_PUBLIC=/public
- NGINX_TEMPLATE=application.conf
16 changes: 16 additions & 0 deletions environments/shopware/shopware.darwin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: "3.5"

x-volumes: &volumes
- appdata:/var/www/html

services:
nginx:
environment:
- XDEBUG_CONNECT_BACK_HOST=${XDEBUG_CONNECT_BACK_HOST:-host.docker.internal}
volumes: *volumes

php-fpm: { volumes: *volumes }
php-debug: { volumes: *volumes }

volumes:
appdata:
19 changes: 19 additions & 0 deletions environments/shopware/shopware.db.base.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: "3.5"
services:
php-fpm:
depends_on:
- db

db:
hostname: "${WARDEN_ENV_NAME}-mariadb"
image: docker.io/wardenenv/mariadb:${MARIADB_VERSION:-10.4}
environment:
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-shopware}
- MYSQL_DATABASE=${MYSQL_DATABASE:-shopware}
- MYSQL_USER=${MYSQL_USER:-shopware}
- MYSQL_PASSWORD=${MYSQL_PASSWORD:-shopware}
volumes:
- dbdata:/var/lib/mysql

volumes:
dbdata:
9 changes: 9 additions & 0 deletions environments/shopware/shopware.linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: "3.5"

x-volumes: &volumes
- .${WARDEN_WEB_ROOT:-}/:/var/www/html

services:
nginx: { volumes: *volumes }
php-fpm: { volumes: *volumes }
php-debug: { volumes: *volumes }
23 changes: 23 additions & 0 deletions environments/shopware/shopware.mutagen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
sync:
defaults:
mode: two-way-resolved
watch:
pollingInterval: 10
ignore:
vcs: true
paths:
# System files
- ".DS_Store"
- "._*"

# Vim files
- "*~"
- "*.sw[a-p]"

# IDE files
- ".idea"

permissions:
defaultFileMode: "0644"
defaultDirectoryMode: "0755"

0 comments on commit a067969

Please sign in to comment.