Merge remote-tracking branch 'origin/develop' for release 0.10.2

wardenenv · Apr 3, 2021 · c21c47e · c21c47e
2 parents 752d86b + 7e3837b
commit c21c47e
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,20 @@
 # Change Log
 
 ## UNRELEASED [x.y.z](https://github.com/davidalger/warden/tree/x.y.z) (yyyy-mm-dd)
-[All Commits](https://github.com/davidalger/warden/compare/0.10.1..develop)
+[All Commits](https://github.com/davidalger/warden/compare/0.10.2..develop)
+
+## Version [0.10.2](https://github.com/davidalger/warden/tree/0.10.2) (2021-04-03)
+[All Commits](https://github.com/davidalger/warden/compare/0.10.1..0.10.2)
 
 **Big Fixes:**
 
+* Fixed bug where Live Reload might not work when Varnish was disabled due to routing priorities ([#337](https://github.com/davidalger/warden/pull/337) by @alinalexandru)
+
 **Enhancements:**
 
+* Magento 1 and Magento 2 environments now set developer environment variables by default ([#332](https://github.com/davidalger/warden/pull/332) by @norgeindian)
+* SSH Agent forwarding will no longer use socat except when needed ([#334](https://github.com/davidalger/warden/pull/334) by @alinalexandru)
+
 ## Version [0.10.1](https://github.com/davidalger/warden/tree/0.10.1) (2021-03-01)
 [All Commits](https://github.com/davidalger/warden/compare/0.10.0..0.10.1)
 

diff --git a/commands/env.cmd b/commands/env.cmd
@@ -48,6 +48,11 @@ if [[ ${XDEBUG_CONNECT_BACK_HOST} == '' ]] && grep -sqi microsoft /proc/sys/kern
  export XDEBUG_CONNECT_BACK_HOST=host.docker.internal
 fi
 
+## For linux, if UID is 1000, there is no need to use the socat proxy.
+if [[ ${WARDEN_ENV_SUBT} == "linux" && $UID == 1000 ]]; then
+ export SSH_AUTH_SOCK_PATH_ENV=/run/host-services/ssh-auth.sock
+fi
+
 ## configure docker-compose files
 DOCKER_COMPOSE_ARGS=()
 

diff --git a/docs/configuration/dns-resolver.md b/docs/configuration/dns-resolver.md
@@ -21,19 +21,22 @@ If you desire to have more than this route through the `dnsmasq` container, you
 1.0.0.1
 ```
 
-#### Ubuntu
+#### Ubuntu systemd-resolved
 
-Open up your connection (WiFi/LAN) settings, and go to the IPv4 tab. Turn off the automatic DNS setting, and enter the following IP addresses
+`systemd-resolved` can we configured to forward the requests of `.test` TLD to another DNS server. The configuration file is typically located at `/etc/systemd/resolved.conf`. Change the file to contain the following lines.
 
 ```text
-127.0.0.1, 1.1.1.1 1.0.0.1
+DNS=127.0.0.1
+Domains=~test
 ```
 
-### Persistent global configuration
+Restart the `systemd-resolved`
 
-To avoid having to set the DNS servers for each network you connect you, you can also choose update the global DNS configuration.
+```bash
+sudo service systemd-resolved restart
+```
 
-#### Ubuntu
+#### Ubuntu resolvconf
 
 Use the `resolvconf` service to add a permanent entry in your `/etc/resolv.conf` file.
 

diff --git a/environments/includes/blackfire.base.yml b/environments/includes/blackfire.base.yml
@@ -16,7 +16,7 @@ services:
  environment:
  - TRAEFIK_DOMAIN
  - TRAEFIK_SUBDOMAIN
- - SSH_AUTH_SOCK=/tmp/ssh-auth.sock
+ - SSH_AUTH_SOCK=${SSH_AUTH_SOCK_PATH_ENV:-/tmp/ssh-auth.sock}
  - NODE_VERSION=${NODE_VERSION:-10}
  - COMPOSER_VERSION=${COMPOSER_VERSION:-1}
  - COMPOSER_MEMORY_LIMIT=-1

diff --git a/environments/includes/php-fpm.base.yml b/environments/includes/php-fpm.base.yml
@@ -21,7 +21,7 @@ services:
  environment:
  - TRAEFIK_DOMAIN
  - TRAEFIK_SUBDOMAIN
- - SSH_AUTH_SOCK=/tmp/ssh-auth.sock
+ - SSH_AUTH_SOCK=${SSH_AUTH_SOCK_PATH_ENV:-/tmp/ssh-auth.sock}
  - NODE_VERSION=${NODE_VERSION:-10}
  - COMPOSER_VERSION=${COMPOSER_VERSION:-1}
  - COMPOSER_MEMORY_LIMIT=-1
@@ -36,7 +36,7 @@ services:
  environment:
  - TRAEFIK_DOMAIN
  - TRAEFIK_SUBDOMAIN
- - SSH_AUTH_SOCK=/tmp/ssh-auth.sock
+ - SSH_AUTH_SOCK=${SSH_AUTH_SOCK_PATH_ENV:-/tmp/ssh-auth.sock}
  - NODE_VERSION=${NODE_VERSION:-10}
  - COMPOSER_VERSION=${COMPOSER_VERSION:-1}
  - COMPOSER_MEMORY_LIMIT=-1

diff --git a/environments/magento1/magento1.base.yml b/environments/magento1/magento1.base.yml
@@ -4,3 +4,11 @@ services:
  environment:
  - NGINX_PUBLIC=${NGINX_PUBLIC:-}
  - NGINX_TEMPLATE=magento1.conf
+
+ php-fpm:
+ environment:
+ - MAGE_IS_DEVELOPER_MODE=1
+
+ php-debug:
+ environment:
+ - MAGE_IS_DEVELOPER_MODE=1
diff --git a/environments/magento2/magento2.base.yml b/environments/magento2/magento2.base.yml
@@ -9,9 +9,15 @@ services:
  labels:
  - traefik.enable=true
  - traefik.http.routers.${WARDEN_ENV_NAME}-livereload.tls=true
- - traefik.http.routers.${WARDEN_ENV_NAME}-livereload.priority=2
+ - traefik.http.routers.${WARDEN_ENV_NAME}-livereload.priority=3
  - traefik.http.routers.${WARDEN_ENV_NAME}-livereload.rule=
  (HostRegexp(`{subdomain:.+}.${TRAEFIK_DOMAIN}`) || Host(`${TRAEFIK_DOMAIN}`))
  && (Path(`/livereload.js`) || Path(`/livereload`))
  - traefik.http.routers.${WARDEN_ENV_NAME}-livereload.service=${WARDEN_ENV_NAME}-livereload
  - traefik.http.services.${WARDEN_ENV_NAME}-livereload.loadbalancer.server.port=35729
+ environment:
+ - MAGE_DEBUG_SHOW_ARGS=1
+
+ php-debug:
+ environment:
+ - MAGE_DEBUG_SHOW_ARGS=1
diff --git a/homepage/package-lock.json b/homepage/package-lock.json
diff --git a/images/elasticsearch/6.8/Dockerfile b/images/elasticsearch/6.8/Dockerfile
@@ -1,3 +1,3 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.14
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.15
 RUN bin/elasticsearch-plugin install analysis-phonetic \
  && bin/elasticsearch-plugin install analysis-icu
diff --git a/images/elasticsearch/7.11/Dockerfile b/images/elasticsearch/7.11/Dockerfile
diff --git a/images/elasticsearch/7.10/Dockerfile → images/elasticsearch/7.12/Dockerfile b/images/elasticsearch/7.10/Dockerfile → images/elasticsearch/7.12/Dockerfile
@@ -1,3 +1,3 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:7.10.2
+FROM docker.elastic.co/elasticsearch/elasticsearch:7.12.0
 RUN bin/elasticsearch-plugin install analysis-phonetic \
  && bin/elasticsearch-plugin install analysis-icu
diff --git a/images/elasticsearch/7.6/Dockerfile b/images/elasticsearch/7.6/Dockerfile
diff --git a/images/elasticsearch/7.7/Dockerfile b/images/elasticsearch/7.7/Dockerfile
diff --git a/images/elasticsearch/7.8/Dockerfile b/images/elasticsearch/7.8/Dockerfile
diff --git a/images/elasticsearch/7.9/Dockerfile b/images/elasticsearch/7.9/Dockerfile
diff --git a/images/mariadb/10.5/Dockerfile b/images/mariadb/10.5/Dockerfile
@@ -0,0 +1 @@
+FROM mariadb:10.5
diff --git a/images/mysql/8.0/Dockerfile b/images/mysql/8.0/Dockerfile
@@ -0,0 +1 @@
+FROM mysql:8.0
diff --git a/version b/version
@@ -1 +1 @@
-0.10.1
+0.10.2