upstream/master
→
origin/master
cd ~/mastodon
git status
git branch
git checkout master
git branch
git fetch upstream master --tags
git merge upstream/master
git push origin master --tags
git branch -av
origin/master
→ origin/social.hyuki.net
cd ~/mastodon
git branch
git checkout social.hyuki.net
git branch
git merge v1.6.0 # v1.6.0 を social.hyuki.net にマージ
git reset --hard ORIG_HEAD # マージをやめるとき
open -a sourcetree . # マージを確認してタグを打つ(`hyuki-v1.6.0`)
git push
public/favicon.ico
CONFLICTapp/views/about/_links.html.haml
CONFLICT (@instance_presenter.source_url)spec/views/about/show.html.haml_spec.rb|16 col 33| source_url: 'https://github.com/tootsuite/mastodon',
Dockerfile
cd /opt
sudo tar cvf ~/mastodon-archive/mastodon.2017-09-17.tar mastodon
sudo yum update
## mastodon-go
cd /opt/mastodon
## mastodon-stop
docker-compose stop
git branch
git remote -v
git checkout social.hyuki.net
git branch
git fetch --tags origin
git merge hyuki-v1.6.0
## docker system prune # ディスク容量ひっぱくしているとき
## mastodon-go
cd /opt/mastodon
docker-compose pull
docker-compose build
docker-compose run --rm web rails db:migrate
docker-compose run --rm web rails assets:precompile
docker-compose run --rm web rails mastodon:maintenance:remove_deprecated_preview_cards
## mastodon-restart
docker-compose up -d
sudo systemctl restart nginx
git push
config/initializers/source.rb
を追加した)@zundanさんのを見て修正。
# frozen_string_literal: true
module Mastodon
module Version
module_functiondef source_base_url
'https://github.com/hyuki0000/mastodon'
end
end
end
### mastodon-login
$ cd /opt/mastodon
$ docker exec -it mastodon_web_1 /bin/sh
# RAILS_ENV=production bundle exec rails c
irb> Mastodon::Version.source_base_url
### mastodon-go
$ cd /opt/mastodon
$ docker-compose logs -f web