Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' for release 0.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
davidalger committed Apr 11, 2020
2 parents d9a6e2d + e19fc72 commit 7d80b36
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,25 @@
## 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.4.0..develop)

## Version [0.4.1](https://github.com/davidalger/warden/tree/0.4.1) (2020-04-11)
[All Commits](https://github.com/davidalger/warden/compare/0.4.0..0.4.1)

**Bug Fixes:**

* Removed `tmpfs` volumes from sub-directories of `/var/www/html` when `WARDEN_TEST_DB=1` was set due to compatibility issues ([#139](https://github.com/davidalger/warden/pull/139) by @lbajsarowicz)

## Version [0.4.0](https://github.com/davidalger/warden/tree/0.4.0) (2020-04-02)
[All Commits](https://github.com/davidalger/warden/compare/0.3.1..0.4.0)

**Upgrade Notes:**

The introduction of SSH Agent Forwarding support in [PR #121](https://github.com/davidalger/warden/pull/121) results in Warden now requiring Docker Desktop 2.2.0.0 or later for macOS clients. Please upgrade Docker Desktop prior to upgrading to the latest Warden release to avoid errors relating to unauthorized mounts.

**Enhancements:**

* Added MySQL 5.6 and 5.7 images to Quay repository for use with Warden environments
* Added support for Integration, Unit and API Tests leveraging a `MySQL 5.7` container running on `tempfs` memory disk ([#121](https://github.com/davidalger/warden/pull/115) by @lbajsarowicz)
* Added `WARDEN_ALLURE` setting to control Allure separately from Selenium for use reporting on Integration and Unit tests ([#121](https://github.com/davidalger/warden/pull/117) by @lbajsarowicz)
* Added support for Integration, Unit and API Tests leveraging a `MySQL 5.7` container running on `tempfs` memory disk ([#115](https://github.com/davidalger/warden/pull/115) by @lbajsarowicz)
* Added `WARDEN_ALLURE` setting to control Allure separately from Selenium for use reporting on Integration and Unit tests ([#117](https://github.com/davidalger/warden/pull/117) by @lbajsarowicz)
* Added ssh agent forwarding support on both macOS and Linux hosts ([#121](https://github.com/davidalger/warden/pull/121) by @davidalger)
* Updated entrypoint in php-fpm images to support mounting PEM files into `/etc/pki/ca-trust/source/anchors` ([3a841b7d](https://github.com/davidalger/warden/commit/3a841b7dd80c6827bc8bf238ae8ff53b2519a258))
* Updated config for Mutagen sync to exclude large files (*.sql, *.gz, *.zip, *.bz2) from sync sessions
Expand Down
5 changes: 5 additions & 0 deletions commands/env-init.help
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ WARDEN_USAGE=$(cat <<EOF
-v, --verbose Increases verbosity of output
\033[33mEnvironment Types:\033[0m
local Declares the docker-compose version and labels the project
network allowing Warden to recognize it. Must be coupled with
per-project configuration. See documentation for details:
https://docs.warden.dev/environments/types.html#local
magento2 Nginx, varnish, php-fpm, db (mariadb), elasticsearch, redis,
rabbitmq, and mailhog services pre configured for Magento 2;
on macOS systems code files are synced into container using
Expand Down
3 changes: 2 additions & 1 deletion docs/installing.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ Installing Warden

### Prerequisites

* [Docker for Mac](https://hub.docker.com/editions/community/docker-ce-desktop-mac) or [Docker for Linux](https://docs.docker.com/install/) (Warden has been tested on Fedora 29 and Ubuntu 18.10)
* [Docker Desktop for Mac
](https://hub.docker.com/editions/community/docker-ce-desktop-mac) 2.2.0.0 or later; or [Docker for Linux](https://docs.docker.com/install/) (Warden has been tested on Fedora 29 and Ubuntu 18.10)
* `docker-compose` available in your `$PATH` (can be installed via `brew`, `apt`, `dnf`, or `pip3`)
* [Mutagen](https://mutagen.io/) v0.10.3 or later installed via Homebrew (required on macOS only; Warden will attempt to install this via `brew` if not present)

Expand Down
17 changes: 0 additions & 17 deletions environments/magento2/magento2.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,10 @@ services:
- --max_allowed_packet=1024M
- --explicit_defaults_for_timestamp=on
volumes:
- tmp-cache:/var/cache
- tmp-dbdata:/var/lib/mysql

php-fpm:
volumes:
- tmp-files:/var/www/html/dev/tests/integration/tmp/

php-debug:
volumes:
- tmp-files:/var/www/html/dev/tests/integration/tmp/

volumes:
tmp-dbdata:
driver_opts:
type: tmpfs
device: tmpfs
tmp-cache:
driver_opts:
type: tmpfs
device: tmpfs
tmp-files:
driver_opts:
type: tmpfs
device: tmpfs
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.0
0.4.1

0 comments on commit 7d80b36

Please sign in to comment.