From 76b54b32cae25812c223cdd6c0f9d090ae92fb3d Mon Sep 17 00:00:00 2001 From: medienagent-user <33146807+medienagent-user@users.noreply.github.com> Date: Wed, 18 Oct 2023 19:14:58 +0200 Subject: [PATCH 1/4] sed on mac needs -e --- install.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.yaml b/install.yaml index a430730..ab136a2 100644 --- a/install.yaml +++ b/install.yaml @@ -18,4 +18,4 @@ post_install_actions: - | #ddev-description: Change the redis dump filename # - sed -i "s/REPLACE_ME/${DDEV_SITENAME}/g" redis/snapshots.conf + sed -i -e "s/REPLACE_ME/${DDEV_SITENAME}/g" redis/snapshots.conf From e66b6a80a43dd5bd51b17d24795f669b424cc149 Mon Sep 17 00:00:00 2001 From: medienagent-user <33146807+medienagent-user@users.noreply.github.com> Date: Thu, 19 Oct 2023 10:49:33 +0200 Subject: [PATCH 2/4] blind test --- install.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install.yaml b/install.yaml index ab136a2..6961153 100644 --- a/install.yaml +++ b/install.yaml @@ -18,4 +18,6 @@ post_install_actions: - | #ddev-description: Change the redis dump filename # - sed -i -e "s/REPLACE_ME/${DDEV_SITENAME}/g" redis/snapshots.conf + # sed -i -e "s/REPLACE_ME/${DDEV_SITENAME}/g" redis/snapshots.conf + # blind test + docker run -i --rm ddev/ddev-utilities sed -i -e "s/REPLACE_ME/${DDEV_SITENAME}/g" redis/snapshots.conf From aadaa5af42619a69d7a3776214b2b6ed5566c14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20M=C3=BCller?= Date: Wed, 25 Oct 2023 15:53:49 +0200 Subject: [PATCH 3/4] Revert "blind test" This reverts commit e66b6a80a43dd5bd51b17d24795f669b424cc149. --- install.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/install.yaml b/install.yaml index 6961153..ab136a2 100644 --- a/install.yaml +++ b/install.yaml @@ -18,6 +18,4 @@ post_install_actions: - | #ddev-description: Change the redis dump filename # - # sed -i -e "s/REPLACE_ME/${DDEV_SITENAME}/g" redis/snapshots.conf - # blind test - docker run -i --rm ddev/ddev-utilities sed -i -e "s/REPLACE_ME/${DDEV_SITENAME}/g" redis/snapshots.conf + sed -i -e "s/REPLACE_ME/${DDEV_SITENAME}/g" redis/snapshots.conf From f4edc30bdbe8a5efa07cf0533a3c0eeb65414a4e Mon Sep 17 00:00:00 2001 From: Sibin Grasic Date: Wed, 25 Oct 2023 16:07:03 +0200 Subject: [PATCH 4/4] fix: Implemented ddev-utility sed sed is bugging out on macOS. We use docker image and standardized sed --- install.yaml | 5 +---- tests/test.bats | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/install.yaml b/install.yaml index 6961153..a60a2d8 100644 --- a/install.yaml +++ b/install.yaml @@ -17,7 +17,4 @@ project_files: post_install_actions: - | #ddev-description: Change the redis dump filename - # - # sed -i -e "s/REPLACE_ME/${DDEV_SITENAME}/g" redis/snapshots.conf - # blind test - docker run -i --rm ddev/ddev-utilities sed -i -e "s/REPLACE_ME/${DDEV_SITENAME}/g" redis/snapshots.conf + docker run -e DDEV_SITENAME -v "$(pwd)"/redis:/redis -i --rm ddev/ddev-utilities bash -c "sed -i 's/REPLACE_ME/$DDEV_SITENAME/g' /redis/snapshots.conf" diff --git a/tests/test.bats b/tests/test.bats index 7bdfad3..7b9e5a3 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -84,7 +84,7 @@ teardown() { @test "install from release" { set -eu -o pipefail cd "$TEST_DIR" || ( printf "unable to cd to "$TEST_DIR"\n" && exit 1 ) - echo "# ddev get oblakstudio/ddev-redis with project "$PROJECT" in "$TEST_DIR"" >&3 - health_checks "oblakstudio/ddev-redis-7" + echo "# ddev get ddev/ddev-redis with project "$PROJECT" in "$TEST_DIR"" >&3 + health_checks "ddev/ddev-redis-7" }