Merge branch 'release/2.4.48' into craft-webpack

nystudio107 · Oct 20, 2021 · 4c26b43 · 4c26b43
2 parents 1a2ecd3 + 84149ee
commit 4c26b43
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/craft Change Log
 
+## 2.4.48 - 2021.10.20
+### Changed
+* Updated the `Makefile` to accommodate the change in Docker to using `-` instead of `_` in container names
+
 ## 2.4.47 - 2021.08.07
 ### Added
 * Handle both `XDEBUG_SESSION` and `XDEBUG_PROFILE` cookies

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
-CONTAINER?=$(shell basename $(CURDIR))_php_1
-BUILDCHAIN?=$(shell basename $(CURDIR))_webpack_1
+CONTAINER?=$(shell basename $(CURDIR))-php-1
+BUILDCHAIN?=$(shell basename $(CURDIR))-webpack-1
 
 .PHONY: build clean composer dev npm pulldb restoredb up