From fb317cc302c439b84e0038b6f473c97f17ea92ce Mon Sep 17 00:00:00 2001 From: Jacob Dreesen Date: Tue, 19 Nov 2024 15:28:17 +0100 Subject: [PATCH 1/3] Rename docker-compose.yaml to compose.yaml --- docker-compose.yaml => compose.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker-compose.yaml => compose.yaml (100%) diff --git a/docker-compose.yaml b/compose.yaml similarity index 100% rename from docker-compose.yaml rename to compose.yaml From dcff274b22a0a7ce8ad48ae0ac435b1e01817bca Mon Sep 17 00:00:00 2001 From: Jacob Dreesen Date: Tue, 19 Nov 2024 19:18:36 +0100 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 15c172f3c..ea43a41c7 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ You don't need to have a PHP environment with composer installed. `cd my-project/` 3. Part of the new project is a docker compose file - * Run `sed -i "s|#user: '1000:1000'|user: '$(id -u):$(id -g)'|g" docker-compose.yaml` to set the correct user id and group id. + * Run `sed -i "s|#user: '1000:1000'|user: '$(id -u):$(id -g)'|g" compose.yaml` to set the correct user id and group id. * Start the needed services with `docker compose up -d` 4. Install pimcore and initialize the DB From 01314ecd743dc5dc756dca0ad13dd99431da7ca2 Mon Sep 17 00:00:00 2001 From: Jacob Dreesen Date: Tue, 19 Nov 2024 19:19:05 +0100 Subject: [PATCH 3/3] Update pimcore-skeleton.yml --- .github/workflows/pimcore-skeleton.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pimcore-skeleton.yml b/.github/workflows/pimcore-skeleton.yml index 42347916f..8755426ec 100644 --- a/.github/workflows/pimcore-skeleton.yml +++ b/.github/workflows/pimcore-skeleton.yml @@ -69,7 +69,7 @@ jobs: cd sample-project/ # Set up docker-compose.yaml to use current user's uid:gid, just like README.md suggests. - sed -i "s|#user: '1000:1000'|user: '$(id -u):$(id -g)'|g" docker-compose.yaml + sed -i "s|#user: '1000:1000'|user: '$(id -u):$(id -g)'|g" compose.yaml # Start containers docker compose pull --quiet