From 6e40e8ef7abda100c77bd854049ee59174f22729 Mon Sep 17 00:00:00 2001 From: TheDevPanda <36032606+TheDevPanda@users.noreply.github.com> Date: Sat, 1 Oct 2022 09:21:21 +0200 Subject: [PATCH 1/3] Fix mysql import in nextcloud readme Replacing -p with --password because of: 'If you use the short option form (-p), you cannot have a space between the option and the password.' - mysql man page --- nextcloud/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/README.md b/nextcloud/README.md index 2614b55f705a..988ebc439912 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -548,7 +548,7 @@ You're already using Nextcloud and want to switch to docker? Great! Here are som ```console docker cp ./database.dmp nextcloud_db_1:/dmp - docker-compose exec db sh -c "mysql -u USER -p PASSWORD nextcloud < /dmp" + docker-compose exec db sh -c "mysql --user USER --password PASSWORD nextcloud < /dmp" docker-compose exec db rm /dmp ``` From fb92e09aa284ec459224c1d4b88cafbb537e4451 Mon Sep 17 00:00:00 2001 From: TheDevPanda <36032606+TheDevPanda@users.noreply.github.com> Date: Wed, 5 Oct 2022 20:10:16 +0200 Subject: [PATCH 2/3] [nextcloud] Put changes into content.md because readme is autogenerated --- nextcloud/content.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/content.md b/nextcloud/content.md index 054aeb3a36e0..a2dbab047b16 100644 --- a/nextcloud/content.md +++ b/nextcloud/content.md @@ -496,7 +496,7 @@ You're already using Nextcloud and want to switch to docker? Great! Here are som ```console docker cp ./database.dmp nextcloud_db_1:/dmp - docker-compose exec db sh -c "mysql -u USER -p PASSWORD nextcloud < /dmp" + docker-compose exec db sh -c "mysql --user USER --password PASSWORD nextcloud < /dmp" docker-compose exec db rm /dmp ``` From 10f9e38615bd5160f16e320beaf03cf037f16b90 Mon Sep 17 00:00:00 2001 From: TheDevPanda <36032606+TheDevPanda@users.noreply.github.com> Date: Wed, 5 Oct 2022 20:11:52 +0200 Subject: [PATCH 3/3] [nextcloud] Revert readme to original state --- nextcloud/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/README.md b/nextcloud/README.md index 988ebc439912..2614b55f705a 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -548,7 +548,7 @@ You're already using Nextcloud and want to switch to docker? Great! Here are som ```console docker cp ./database.dmp nextcloud_db_1:/dmp - docker-compose exec db sh -c "mysql --user USER --password PASSWORD nextcloud < /dmp" + docker-compose exec db sh -c "mysql -u USER -p PASSWORD nextcloud < /dmp" docker-compose exec db rm /dmp ```