From 7471e27ecdc19bc108b5b3ae2f778d0843cd4f07 Mon Sep 17 00:00:00 2001 From: David Alger Date: Mon, 15 Mar 2021 09:31:05 -0500 Subject: [PATCH 01/16] Bumped ES 7.11 image to 7.11.2 --- images/elasticsearch/7.11/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/elasticsearch/7.11/Dockerfile b/images/elasticsearch/7.11/Dockerfile index d5385073..a45f9239 100644 --- a/images/elasticsearch/7.11/Dockerfile +++ b/images/elasticsearch/7.11/Dockerfile @@ -1,3 +1,3 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.11.1 +FROM docker.elastic.co/elasticsearch/elasticsearch:7.11.2 RUN bin/elasticsearch-plugin install analysis-phonetic \ && bin/elasticsearch-plugin install analysis-icu From b1034297068f57e22dda23056753904d3398989e Mon Sep 17 00:00:00 2001 From: David Alger Date: Mon, 15 Mar 2021 09:32:09 -0500 Subject: [PATCH 02/16] Added images for MariaDB 10.5 and MySQL 8.0 --- images/mariadb/10.5/Dockerfile | 1 + images/mysql/8.0/Dockerfile | 1 + 2 files changed, 2 insertions(+) create mode 100644 images/mariadb/10.5/Dockerfile create mode 100644 images/mysql/8.0/Dockerfile diff --git a/images/mariadb/10.5/Dockerfile b/images/mariadb/10.5/Dockerfile new file mode 100644 index 00000000..787e7f03 --- /dev/null +++ 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 new file mode 100644 index 00000000..71975962 --- /dev/null +++ b/images/mysql/8.0/Dockerfile @@ -0,0 +1 @@ +FROM mysql:8.0 From d775742277ac84ec826252921fe7c31101ee33d6 Mon Sep 17 00:00:00 2001 From: Alin Alexandru Date: Fri, 19 Mar 2021 12:19:56 +0200 Subject: [PATCH 03/16] Added documentation for systemd-resolved --- docs/configuration/dns-resolver.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/docs/configuration/dns-resolver.md b/docs/configuration/dns-resolver.md index 9038752a..516fc43b 100644 --- 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. From bc108b1e5e88f1ee43c1bf244c8c62ebaa8f44de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 21 Mar 2021 12:21:12 +0000 Subject: [PATCH 04/16] Bump is-svg from 4.2.1 to 4.3.1 in /homepage Bumps [is-svg](https://github.com/sindresorhus/is-svg) from 4.2.1 to 4.3.1. - [Release notes](https://github.com/sindresorhus/is-svg/releases) - [Commits](https://github.com/sindresorhus/is-svg/compare/v4.2.1...v4.3.1) Signed-off-by: dependabot[bot] --- homepage/package-lock.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/homepage/package-lock.json b/homepage/package-lock.json index 7503cfff..70193714 100644 --- a/homepage/package-lock.json +++ b/homepage/package-lock.json @@ -2930,6 +2930,13 @@ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, + "fast-xml-parser": { + "version": "3.19.0", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz", + "integrity": "sha512-4pXwmBplsCPv8FOY1WRakF970TjNGnGnfbOnLqjlYvMiF1SR3yOHyxMR/YCXpPTOspNF5gwudqktIP4VsWkvBg==", + "dev": true, + "optional": true + }, "fastq": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz", @@ -5753,13 +5760,6 @@ "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", "dev": true }, - "html-comment-regex": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz", - "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==", - "dev": true, - "optional": true - }, "html-minifier": { "version": "3.5.21", "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz", @@ -6302,13 +6302,13 @@ "optional": true }, "is-svg": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-4.2.1.tgz", - "integrity": "sha512-PHx3ANecKsKNl5y5+Jvt53Y4J7MfMpbNZkv384QNiswMKAWIbvcqbPz+sYbFKJI8Xv3be01GSFniPmoaP+Ai5A==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-4.3.1.tgz", + "integrity": "sha512-h2CGs+yPUyvkgTJQS9cJzo9lYK06WgRiXUqBBHtglSzVKAuH4/oWsqk7LGfbSa1hGk9QcZ0SyQtVggvBA8LZXA==", "dev": true, "optional": true, "requires": { - "html-comment-regex": "^1.1.2" + "fast-xml-parser": "^3.19.0" } }, "is-symbol": { From a932b04de0b5ae28cade27a3f51488479409ba55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=A4fer?= Date: Tue, 23 Mar 2021 08:35:39 +0100 Subject: [PATCH 05/16] Set developer mode for M1 --- environments/magento1/magento1.base.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/environments/magento1/magento1.base.yml b/environments/magento1/magento1.base.yml index 7173a456..7e01d44f 100644 --- 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 From df45cf4079247b2a750f4e8184d61ca8c73e720d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=A4fer?= Date: Tue, 23 Mar 2021 08:42:21 +0100 Subject: [PATCH 06/16] Set MAGE_DEBUG_SHOW_ARGS for M2 --- environments/magento2/magento2.base.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/environments/magento2/magento2.base.yml b/environments/magento2/magento2.base.yml index 780807aa..0fa5bf96 100644 --- a/environments/magento2/magento2.base.yml +++ b/environments/magento2/magento2.base.yml @@ -15,3 +15,9 @@ services: && (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 From de9e9f5cbeca8ef27cdff512c37dd303771b6ae7 Mon Sep 17 00:00:00 2001 From: David Alger Date: Thu, 25 Mar 2021 09:26:34 -0500 Subject: [PATCH 07/16] Updated ES 6.8.x image to latest patch version --- images/elasticsearch/6.8/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/elasticsearch/6.8/Dockerfile b/images/elasticsearch/6.8/Dockerfile index 3a80d970..dcd96dc8 100644 --- 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 From 4a38bb21beb47efe7b5ee992619ad83291f1d3cb Mon Sep 17 00:00:00 2001 From: David Alger Date: Thu, 25 Mar 2021 09:31:14 -0500 Subject: [PATCH 08/16] Updated CL for #332 #292 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93829f64..cb1542fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ **Enhancements:** +* Magento 1 and Magento 2 environments now set developer environment variables by default ([#332](https://github.com/davidalger/warden/pull/332) by @norgeindian) + ## 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) From 92753f26c7422b54e4c3f834953292c4eefca3b9 Mon Sep 17 00:00:00 2001 From: David Alger Date: Thu, 25 Mar 2021 09:33:18 -0500 Subject: [PATCH 09/16] Added ES image for 7.12; dropped older 7.x from builds --- images/elasticsearch/7.11/Dockerfile | 3 --- images/elasticsearch/{7.10 => 7.12}/Dockerfile | 2 +- images/elasticsearch/7.6/Dockerfile | 3 --- images/elasticsearch/7.7/Dockerfile | 3 --- images/elasticsearch/7.8/Dockerfile | 3 --- images/elasticsearch/7.9/Dockerfile | 3 --- 6 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 images/elasticsearch/7.11/Dockerfile rename images/elasticsearch/{7.10 => 7.12}/Dockerfile (65%) delete mode 100644 images/elasticsearch/7.6/Dockerfile delete mode 100644 images/elasticsearch/7.7/Dockerfile delete mode 100644 images/elasticsearch/7.8/Dockerfile delete mode 100644 images/elasticsearch/7.9/Dockerfile diff --git a/images/elasticsearch/7.11/Dockerfile b/images/elasticsearch/7.11/Dockerfile deleted file mode 100644 index a45f9239..00000000 --- a/images/elasticsearch/7.11/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.11.2 -RUN bin/elasticsearch-plugin install analysis-phonetic \ - && bin/elasticsearch-plugin install analysis-icu diff --git a/images/elasticsearch/7.10/Dockerfile b/images/elasticsearch/7.12/Dockerfile similarity index 65% rename from images/elasticsearch/7.10/Dockerfile rename to images/elasticsearch/7.12/Dockerfile index 3a6cd24b..e54a7ebe 100644 --- a/images/elasticsearch/7.10/Dockerfile +++ b/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 deleted file mode 100644 index e675f1e7..00000000 --- a/images/elasticsearch/7.6/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.6.2 -RUN bin/elasticsearch-plugin install analysis-phonetic \ - && bin/elasticsearch-plugin install analysis-icu diff --git a/images/elasticsearch/7.7/Dockerfile b/images/elasticsearch/7.7/Dockerfile deleted file mode 100644 index 6a782322..00000000 --- a/images/elasticsearch/7.7/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.7.1 -RUN bin/elasticsearch-plugin install analysis-phonetic \ - && bin/elasticsearch-plugin install analysis-icu diff --git a/images/elasticsearch/7.8/Dockerfile b/images/elasticsearch/7.8/Dockerfile deleted file mode 100644 index c5d9d7f2..00000000 --- a/images/elasticsearch/7.8/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.8.1 -RUN bin/elasticsearch-plugin install analysis-phonetic \ - && bin/elasticsearch-plugin install analysis-icu diff --git a/images/elasticsearch/7.9/Dockerfile b/images/elasticsearch/7.9/Dockerfile deleted file mode 100644 index 114ee64a..00000000 --- a/images/elasticsearch/7.9/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.9.3 -RUN bin/elasticsearch-plugin install analysis-phonetic \ - && bin/elasticsearch-plugin install analysis-icu From 43210cf196951f5a875ad1b9fd9e4f5993baa12b Mon Sep 17 00:00:00 2001 From: Alin Alexandru Date: Thu, 25 Mar 2021 21:43:35 +0200 Subject: [PATCH 10/16] Use correct socket path for linux --- environments/includes/blackfire.linux.yml | 2 ++ environments/includes/php-fpm.linux.yml | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/environments/includes/blackfire.linux.yml b/environments/includes/blackfire.linux.yml index 7de28e4b..8c8b93eb 100644 --- a/environments/includes/blackfire.linux.yml +++ b/environments/includes/blackfire.linux.yml @@ -1,5 +1,7 @@ version: "3.5" services: php-blackfire: + environment: + - SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock volumes: - ${SSH_AUTH_SOCK:-/dev/null}:/run/host-services/ssh-auth.sock diff --git a/environments/includes/php-fpm.linux.yml b/environments/includes/php-fpm.linux.yml index 9a5ab3e7..645aa319 100644 --- a/environments/includes/php-fpm.linux.yml +++ b/environments/includes/php-fpm.linux.yml @@ -4,5 +4,11 @@ x-volumes: &volumes - ${SSH_AUTH_SOCK:-/dev/null}:/run/host-services/ssh-auth.sock services: - php-fpm: { volumes: *volumes } - php-debug: { volumes: *volumes } + php-fpm: + environment: + - SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock + volumes: *volumes + php-debug: + environment: + - SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock + volumes: *volumes From d2a9c0decdf6fabebc712accb7ce25ec5488f8f1 Mon Sep 17 00:00:00 2001 From: Alin Alexandru Date: Mon, 29 Mar 2021 18:00:00 +0300 Subject: [PATCH 11/16] Ensure that live reload gets a higher priority when varnish is disabled --- environments/magento2/magento2.base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/magento2/magento2.base.yml b/environments/magento2/magento2.base.yml index 780807aa..7fa2a348 100644 --- a/environments/magento2/magento2.base.yml +++ b/environments/magento2/magento2.base.yml @@ -9,7 +9,7 @@ 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`)) From 6760cc0f840cb768612aa979680187bcd817a971 Mon Sep 17 00:00:00 2001 From: Alin Alexandru Date: Tue, 30 Mar 2021 11:29:17 +0300 Subject: [PATCH 12/16] Disable socat only for linux with uid 1000. Better performance --- commands/env.cmd | 5 +++++ environments/includes/blackfire.base.yml | 2 +- environments/includes/blackfire.linux.yml | 2 -- environments/includes/php-fpm.base.yml | 4 ++-- environments/includes/php-fpm.linux.yml | 10 ++-------- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/commands/env.cmd b/commands/env.cmd index bf492db2..2e9d9a16 100644 --- 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/environments/includes/blackfire.base.yml b/environments/includes/blackfire.base.yml index 6d77ceeb..097946e0 100644 --- 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/blackfire.linux.yml b/environments/includes/blackfire.linux.yml index 8c8b93eb..7de28e4b 100644 --- a/environments/includes/blackfire.linux.yml +++ b/environments/includes/blackfire.linux.yml @@ -1,7 +1,5 @@ version: "3.5" services: php-blackfire: - environment: - - SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock volumes: - ${SSH_AUTH_SOCK:-/dev/null}:/run/host-services/ssh-auth.sock diff --git a/environments/includes/php-fpm.base.yml b/environments/includes/php-fpm.base.yml index 99b59f6a..8797b632 100644 --- 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/includes/php-fpm.linux.yml b/environments/includes/php-fpm.linux.yml index 645aa319..9a5ab3e7 100644 --- a/environments/includes/php-fpm.linux.yml +++ b/environments/includes/php-fpm.linux.yml @@ -4,11 +4,5 @@ x-volumes: &volumes - ${SSH_AUTH_SOCK:-/dev/null}:/run/host-services/ssh-auth.sock services: - php-fpm: - environment: - - SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock - volumes: *volumes - php-debug: - environment: - - SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock - volumes: *volumes + php-fpm: { volumes: *volumes } + php-debug: { volumes: *volumes } From b7e9e6563aeaf0d190151e49e3e691beb90a53cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Apr 2021 07:24:03 +0000 Subject: [PATCH 13/16] Bump y18n from 4.0.0 to 4.0.1 in /homepage Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot[bot] --- homepage/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/homepage/package-lock.json b/homepage/package-lock.json index 70193714..2583a683 100644 --- a/homepage/package-lock.json +++ b/homepage/package-lock.json @@ -10512,9 +10512,9 @@ "dev": true }, "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", + "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==", "dev": true }, "yallist": { From 44839bd8dd911482fa7d4e6a1aa4cac1efe0a16e Mon Sep 17 00:00:00 2001 From: David Alger Date: Fri, 2 Apr 2021 17:30:30 -0500 Subject: [PATCH 14/16] Updated CL for #337 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb1542fb..2ebd19b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ **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) From 684d248b3cfa6eecc56542db450319a6e803af6e Mon Sep 17 00:00:00 2001 From: David Alger Date: Fri, 2 Apr 2021 17:32:32 -0500 Subject: [PATCH 15/16] Updated CL for #334 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ebd19b8..b39ccb9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ **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) From 7e3837b09433094704a2f7d3d3a7f36174e98126 Mon Sep 17 00:00:00 2001 From: David Alger Date: Sat, 3 Apr 2021 12:58:04 -0500 Subject: [PATCH 16/16] Prepare for release --- CHANGELOG.md | 5 ++++- version | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b39ccb9a..9ca70140 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ # 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:** diff --git a/version b/version index 57121573..5eef0f10 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.10.1 +0.10.2