From 835aee1bcb1bd73687800f3932a185be51279b70 Mon Sep 17 00:00:00 2001 From: "Tomoya Matsuura(MacBookPro)" Date: Thu, 15 Feb 2024 13:56:19 +0900 Subject: [PATCH] [obsidian] vault backup: 2024-02-15 13:56:19[ --- ...ƒƒãƒ—デートã§ã„ã¡ã„ã¡docker-compose.ymlã‚’ä¸€æ™‚çš„ã«æ›¸ãæ›ãˆãªã„.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/Mastodonã®ã‚¢ãƒƒãƒ—デートã§ã„ã¡ã„ã¡docker-compose.ymlã‚’ä¸€æ™‚çš„ã«æ›¸ãæ›ãˆãªã„.md b/content/Mastodonã®ã‚¢ãƒƒãƒ—デートã§ã„ã¡ã„ã¡docker-compose.ymlã‚’ä¸€æ™‚çš„ã«æ›¸ãæ›ãˆãªã„.md index e4e251c7..cbce9f5e 100644 --- a/content/Mastodonã®ã‚¢ãƒƒãƒ—デートã§ã„ã¡ã„ã¡docker-compose.ymlã‚’ä¸€æ™‚çš„ã«æ›¸ãæ›ãˆãªã„.md +++ b/content/Mastodonã®ã‚¢ãƒƒãƒ—デートã§ã„ã¡ã„ã¡docker-compose.ymlã‚’ä¸€æ™‚çš„ã«æ›¸ãæ›ãˆãªã„.md @@ -3,7 +3,7 @@ 普通ã€dockerã§é‹ç”¨ã™ã‚‹ã¨ãã¯[[Mastodon]]ã®ãƒªãƒã‚¸ãƒˆãƒªã‚’クローンã—ã¦ãã¦ã€`docker-compose.yml`ã®`build`をコメントアウトã™ã‚‹ã“ã¨ã§ã€ãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰ã‚³ãƒ³ãƒ†ãƒŠã‚¤ãƒ¡ãƒ¼ã‚¸ã‚’pullã™ã‚‹ã‚ˆã†ã«å¤‰ãˆã‚‹ã€‚ -ãŸã ã“ã®å ´åˆã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚¢ãƒƒãƒ—デートã®éš›ã«`git stash && git fetch && git checkout ` ã™ã‚‹ã¨ã“ã‚“ãªæ„Ÿã˜ã«conflictãŒç™ºç”Ÿã™ã‚‹ã€‚(ã“ã“ã§ã¯4.2ï¼–ã‹ã‚‰4.2.5ã«ãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã—ã¦ã‚‹) +ãŸã ã“ã®å ´åˆã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚¢ãƒƒãƒ—デートã®éš›ã«`git stash && git fetch && git checkout ` ã™ã‚‹ã¨ã“ã‚“ãªæ„Ÿã˜ã«conflictãŒç™ºç”Ÿã™ã‚‹ã€‚(ã“ã“ã§ã¯ä¾‹ç¤ºã®ãŸã‚4.2.6ã‹ã‚‰4.2.5ã«ãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã—ã¦ã‚‹ãŒ) ```yml web: