Skip to content

Commit

Permalink
Added optional mutagen usage flag
Browse files Browse the repository at this point in the history
Signed-off-by: Denis Kopylov <dkopylov@magenius.team>
  • Loading branch information
Den4ik committed Feb 22, 2024
1 parent 21bb832 commit 6ecb5eb
Show file tree
Hide file tree
Showing 16 changed files with 91 additions and 49 deletions.
9 changes: 8 additions & 1 deletion commands/env.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ if [[ ${WARDEN_NIGHTLY} -eq 1 ]]; then
export WARDEN_SVC_PHP_IMAGE_SUFFIX="-indev"
fi

## configure mutagen enable by default
WARDEN_MUTAGEN_ENABLE=${WARDEN_MUTAGEN_ENABLE:-1}

##configure environment node variant
export WARDEN_SVC_NODE_VARIANT=""
if [[ ${NODE_VERSION} != "" ]]; then
Expand Down Expand Up @@ -182,7 +185,11 @@ TRAEFIK_ADDRESS="$(docker container inspect traefik \
)"
export TRAEFIK_ADDRESS;

if [[ $OSTYPE =~ ^darwin ]]; then
export MUTAGEN_SYNC_FILE;
if [[ $OSTYPE =~ ^darwin ]] && [[ ${WARDEN_MUTAGEN_ENABLE} -eq 1 ]] \
&& { [[ "${WARDEN_PARAMS[0]}" == "up" ]] || [[ "${WARDEN_PARAMS[0]}" == "start" ]] || [[ "${WARDEN_PARAMS[0]}" == "stop" ]] || [[ "${WARDEN_PARAMS[0]}" == "down" ]]; }; then
echo -e "\033[31mWe noticed that you're on MacOS and using Mutagen sync. We recommend configuring Docker Desktop to use VirtioFS and disable mutagen sync by adding WARDEN_MUTAGEN_ENABLE=0 to ~/.warden/.env file\033[0m"

export MUTAGEN_SYNC_FILE="${WARDEN_DIR}/environments/${WARDEN_ENV_TYPE}/${WARDEN_ENV_TYPE}.mutagen.yml"

if [[ -f "${WARDEN_HOME_DIR}/environments/${WARDEN_ENV_TYPE}/${WARDEN_ENV_TYPE}.mutagen.yml" ]]; then
Expand Down
4 changes: 3 additions & 1 deletion commands/install.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ if [[ ! -f "${WARDEN_HOME_DIR}/.env" ]]; then
cat >> "${WARDEN_HOME_DIR}/.env" <<-EOT
# Set to "1" to enable global Portainer service
WARDEN_PORTAINER_ENABLE=0
# SEt to "0" to disable DNSMasq
# Set to "0" to disable DNSMasq
WARDEN_DNSMASQ_ENABLE=1
# Set to "1" to enable Mutagen
WARDEN_MUTAGEN_ENABLE=1
EOT
fi
6 changes: 1 addition & 5 deletions environments/magento1/magento1.blackfire.darwin.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
version: "3.5"

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

x-environment: &environment
- CHOWN_DIR_LIST=media ${CHOWN_DIR_LIST:-}

services:
php-blackfire: { volumes: *volumes, environment: *environment }
php-blackfire: { environment: *environment }
8 changes: 8 additions & 0 deletions environments/magento1/magento1.blackfire.mutagen.volumes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: "3.5"

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

services:
php-blackfire: { volumes: *volumes }
12 changes: 2 additions & 10 deletions environments/magento1/magento1.darwin.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
version: "3.5"

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

x-environment: &environment
- CHOWN_DIR_LIST=media ${CHOWN_DIR_LIST:-}

services:
nginx: { volumes: *volumes }
php-fpm: { volumes: *volumes, environment: *environment }
php-debug: { volumes: *volumes, environment: *environment }

volumes:
appdata:
php-fpm: { environment: *environment }
php-debug: { environment: *environment }
13 changes: 13 additions & 0 deletions environments/magento1/magento1.mutagen.volumes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: "3.5"

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

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

volumes:
appdata:
6 changes: 1 addition & 5 deletions environments/magento2/magento2.blackfire.darwin.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
version: "3.5"

x-volumes: &volumes
- .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:cached
- appdata:/var/www/html

x-environment: &environment
- CHOWN_DIR_LIST=pub/media ${CHOWN_DIR_LIST:-}

services:
php-blackfire: { volumes: *volumes, environment: *environment }
php-blackfire: { environment: *environment }
8 changes: 8 additions & 0 deletions environments/magento2/magento2.blackfire.mutagen.volumes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: "3.5"

x-volumes: &volumes
- .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:cached
- appdata:/var/www/html

services:
php-blackfire: { volumes: *volumes }
12 changes: 2 additions & 10 deletions environments/magento2/magento2.darwin.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
version: "3.5"

x-volumes: &volumes
- .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:cached
- appdata:/var/www/html

x-environment: &environment
- CHOWN_DIR_LIST=pub/media ${CHOWN_DIR_LIST:-}

services:
nginx: { volumes: *volumes }
php-fpm: { volumes: *volumes, environment: *environment }
php-debug: { volumes: *volumes, environment: *environment }

volumes:
appdata:
php-fpm: { environment: *environment }
php-debug: { environment: *environment }
5 changes: 5 additions & 0 deletions environments/magento2/magento2.magepack.base.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
version: "3.5"

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

services:
magepack:
hostname: "${WARDEN_ENV_NAME}-magepack"
Expand All @@ -11,3 +15,4 @@ services:
- ${TRAEFIK_SUBDOMAIN:-app}.${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
depends_on:
- php-fpm
volumes: *volumes
7 changes: 0 additions & 7 deletions environments/magento2/magento2.magepack.linux.yml

This file was deleted.

13 changes: 13 additions & 0 deletions environments/magento2/magento2.mutagen.volumes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: "3.5"

x-volumes: &volumes
- .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:cached
- appdata:/var/www/html

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

volumes:
appdata:
12 changes: 2 additions & 10 deletions environments/shopware/shopware.darwin.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
version: "3.5"

x-volumes: &volumes
- .${WARDEN_WEB_ROOT:-}/public/media:/var/www/html/public/media:cached
- appdata:/var/www/html

x-environment: &environment
- CHOWN_DIR_LIST=public/media ${CHOWN_DIR_LIST:-}

services:
nginx: { volumes: *volumes }
php-fpm: { volumes: *volumes, environment: *environment }
php-debug: { volumes: *volumes, environment: *environment }

volumes:
appdata:
php-fpm: { environment: *environment }
php-debug: { environment: *environment }
13 changes: 13 additions & 0 deletions environments/shopware/shopware.mutagen.volumes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: "3.5"

x-volumes: &volumes
- .${WARDEN_WEB_ROOT:-}/public/media:/var/www/html/public/media:cached
- appdata:/var/www/html

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

volumes:
appdata:
12 changes: 12 additions & 0 deletions utils/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,16 @@ function appendEnvPartialIfExists () {
DOCKER_COMPOSE_ARGS+=("-f" "${PARTIAL_PATH}")
fi
done

if [[ "${WARDEN_ENV_SUBT}" == "darwin" ]] && [[ "${WARDEN_MUTAGEN_ENABLE}" == "1" ]]; then
for PARTIAL_PATH in \
"${WARDEN_DIR}/environments/${WARDEN_ENV_TYPE}/${PARTIAL_NAME}.mutagen.volumes.yml" \
"${WARDEN_HOME_DIR}/environments/${WARDEN_ENV_TYPE}/${PARTIAL_NAME}.mutagen.volumes.yml" \
"${WARDEN_ENV_PATH}/.warden/environments/${WARDEN_ENV_TYPE}/${PARTIAL_NAME}.mutagen.volumes.yml"
do
if [[ -f "${PARTIAL_PATH}" ]]; then
DOCKER_COMPOSE_ARGS+=("-f" "${PARTIAL_PATH}")
fi
done
fi;
}

0 comments on commit 6ecb5eb

Please sign in to comment.