
ãITãåå¿è ã®ããã®Gitå¿åé²
çããŸãããã«ã¡ã¯
ãã®èšäºã¯ ãGit㯠clone ãš push ãããããç¥ããªãã ãšããç¶æ
ããã§ãçè§£ã§ããããã«ãããŒã«ã«ã§éçºããDjangoã¢ããªãVPSã«ãããã€ããæµããæŽçãããã®ã§ãã
æªæ¥ã®èªåãå¿ããŠãããæãåºããããã«ã解説ããŸãã
åæïŒ
ã»Macã«ãŠäœæ¥ããŠãããŸãã
ã»ãã£ããã€å
ãVPSãšä»®å®ããŠãããŸãã
ãä»åã¯ãVMwareäžã®UbuntuãVPSã«èŠç«ãŠãŠå®æœããŠããŸãã
0. Gitã®åæèšå®ïŒæåã®äžåã ãïŒ
ãŸãã¯Gitã«ã誰ãã³ããããããããæ®ãããã®æ å ±ãèšå®ããŸãã
git config --global user.name "ããªãã®åå"
git config --global user.email "you@example.com"user.name â 衚瀺åïŒæ¬åã§ããã³ãã«ã§ãOKïŒ
user.email â GitHubã¢ã«ãŠã³ãã§ç»é²ããã¡ãŒã«ããããã
ãããã远å èšå®
git config --global init.defaultBranch main # æ°èŠãªã㯠main ã§éå§
git config --global pull.ff only # git pull ã Fast-Forward ã®ã¿ã«
git config --global color.ui auto # åºåãã«ã©ãŒè¡šç€ºç¢ºèªã¯ä»¥äžã§ã§ããŸãïŒ
git config --list1. GitHubã«SSHéµãç»é²ãã
GitHubãšå®å
šã«éä¿¡ããããã« SSHéµ ãäœã£ãŠç»é²ããŸãã
ããããã£ãŠãããšãæ¯åãã¹ã¯ãŒãå
¥åãªãã§ `git push` ã `git pull` ãã§ããŸãã
1-1. éµãäœãïŒMacåŽïŒ
ssh-keygen -t ed25519 -C "you@example.com"ä¿åå Žæã¯ããã©ã«ãã§OKïŒ`~/.ssh/id_ed25519`ïŒ
1-2. å ¬ééµãã³ããŒ
pbcopy < ~/.ssh/id_ed25519.pubâ» pbcopyã¯ãMacã§ãã¡ã€ã«ã®äžèº«ãã¯ãªããããŒãã«ã³ããŒããã³ãã³ãã§ããLinuxãWindowsã®æ¹ã¯ãå 容ãéããŠã¯ãªããããŒããžã³ããŒãã ããã
1-3. GitHubã«ç»é²
GitHubã«ãã°ã€ã³
[Settings] â [SSH and GPG keys] â [New SSH key]
Title ã«ãMacBook ãã¹ãåããªã©åããååãå ¥å
Key ã«ã³ããŒããå ¬ééµã貌ãä»ã â [Add SSH key]
1-4. ãµãŒãïŒVPSïŒçšã®éµãçšæ
# VPSã§å®è¡
ssh-keygen -t ed25519 -C "deploy@vps"
cat ~/.ssh/id_ed25519.pubåºåãããå
¬ééµãã察象ãªããžããªã®
GitHub â Settings â Deploy Keys â Add deploy key ã«ç»é²ïŒRead-onlyã§OKïŒã
2. å šäœåïŒå³ã§ã€ã¡ãŒãžïŒ
å³1ïŒå šäœã®æµãïŒMac â GitHub â VPSïŒ
ââââââââââââââ git push âââââââââââââââ git pull âââââââââââââââ
â Mac (éçºPC) â ââââââââââââââââ¶ â GitHub â ââââââââââââââââ¶ â VPS (ãµãŒã) â
â - ç·šéä¿å â â - ã³ãŒãä¿ç®¡â â - Dockerèµ·å â
â - git add â â - å±¥æŽç®¡ç â â - åèµ·å â
â - git commit â â â ã â - migrate â
ââââââââââââââ âââââââââââââââ âââââââââââââââå³2ïŒããŒã«ã«ã§ã®Gitæäœã®æµã
âââââââââââââââââ
â git status â â 倿Žã確èª
ââââââââ¬âââââââââ
â
ââââââââŒâââââââââ
â git add . â â 倿Žãã¹ããŒãžã«è¿œå
ââââââââ¬âââââââââ
â
ââââââââŒâââââââââ
â git commit -m â â å±¥æŽãæ®ã
ââââââââ¬âââââââââ
â
ââââââââŒâââââââââ
â git push originâ â GitHubãžéä¿¡
âââââââââââââââââå³3ïŒãµãŒãåŽã®æŽæ°æé ïŒããŸãïŒ
âââââââââââââââââ
â git pull --ff-onlyâ â ææ°ãååŸ
ââââââââ¬âââââââââ
â
ââââââââŒâââââââââ
â docker compose â
â build --pull â â ã€ã¡ãŒãžåæ§ç¯
ââââââââ¬âââââââââ
â
ââââââââŒâââââââââ
â docker compose â
â up -d â â åèµ·å
ââââââââ¬âââââââââ
â
ââââââââŒâââââââââ
â docker compose â
â run --rm migrate â â DBæŽæ°(å¿
èŠæã®ã¿)
âââââââââââââââââ3. ããŒã«ã«ïŒMacïŒã§ã®äœæ¥
倿Žã確èª
git statusã©ã®ãã¡ã€ã«ã倿Žããããã確èªã
倿Žãã¹ããŒãžã«è¿œå
git add .次ã®ã³ãããã«å«ããæºåã
å±¥æŽãæ®ã
git commit -m "feat: 決æžããŒãžã®UIæ¹å"ã¹ããŒãžæžã¿ã®å€æŽã1åäœã®èšé²ãšããŠä¿åã
GitHubã«éä¿¡
git push origin mainææ°ã³ãŒããGitHubã«ã¢ããããŒãã
4. GitHubïŒãªã¢ãŒããªããžããªïŒ
ã³ãŒãã®ä¿ç®¡åº«
å±¥æŽç®¡ç
ãµãŒãã¯ãããã `git pull` ã§ææ°ãååŸ
5. ãµãŒãïŒVPSïŒã§ã®äœæ¥
ååã ãïŒãªãé 眮ïŒ
cd /opt
git clone git@github.com:<you>/<repo>.git myapp
cd myappææ°ã³ãŒããååŸ
git pull --ff-only origin mainDockerã€ã¡ãŒãžãåãã«ã
docker compose build --pullãµãŒãã¹ãåèµ·å
docker compose up -dDBæŽæ°ïŒå¿ èŠãªãšãã ãïŒ
docker compose run --rm web python manage.py migrate6. ãã䜿ãGitã³ãã³ãïŒå¿åé²ïŒ
git status â çŸåšã®å€æŽã確èª
git add . â å šå€æŽãã¹ããŒãž
git commit -m "msg" â ã³ãããïŒå±¥æŽä¿åïŒ
git push origin main â GitHubãžéä¿¡
git pull --ff-only origin main â ãµãŒãã«åæ
git log --oneline --graph â å±¥æŽãç°¡æœã«è¡šç€º
git diff â 倿Žç¹ã確èª
git switch -c feat/xxx â æ°ãããã©ã³ããäœæ
git stash push -m "WIP" â äœæ¥ãäžæéé¿
ãŸãšã
MacïŒç·šé â `git add` â `git commit` â `git push`
GitHubïŒã³ãŒãä¿ç®¡åº«ïŒãªã¢ãŒããªããžããªïŒ
VPSïŒ`git pull` â `docker compose build` â `docker compose up -d`
ããã§ãpush â pull â åèµ·åãã®ã·ã³ãã«ãªæµãã§ãããã€ã§ããŸãã
ãã£ãšãæªæ¥ã®èªåãå¿ããŠããã®å¿åé²ãèŠãã°ããæãåºããã¯ãã§ãã
ã§ã¯
ãŸãïŒ