Use Github Container Registry as the official container image source (#24113)
This commit is contained in:
		
							parent
							
								
									75131e7bf7
								
							
						
					
					
						commit
						f9bdaebad2
					
				
					 2 changed files with 4 additions and 5 deletions
				
			
		| 
						 | 
					@ -8,12 +8,10 @@
 | 
				
			||||||
[](https://github.com/mastodon/mastodon/actions/workflows/test-ruby.yml)
 | 
					[](https://github.com/mastodon/mastodon/actions/workflows/test-ruby.yml)
 | 
				
			||||||
[][code_climate]
 | 
					[][code_climate]
 | 
				
			||||||
[][crowdin]
 | 
					[][crowdin]
 | 
				
			||||||
[][docker]
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
[releases]: https://github.com/mastodon/mastodon/releases
 | 
					[releases]: https://github.com/mastodon/mastodon/releases
 | 
				
			||||||
[code_climate]: https://codeclimate.com/github/mastodon/mastodon
 | 
					[code_climate]: https://codeclimate.com/github/mastodon/mastodon
 | 
				
			||||||
[crowdin]: https://crowdin.com/project/mastodon
 | 
					[crowdin]: https://crowdin.com/project/mastodon
 | 
				
			||||||
[docker]: https://hub.docker.com/r/tootsuite/mastodon/
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
Mastodon is a **free, open-source social network server** based on ActivityPub where users can follow friends and discover new ones. On Mastodon, users can publish anything they want: links, pictures, text, video. All Mastodon servers are interoperable as a federated network (users on one server can seamlessly communicate with users from another one, including non-Mastodon software that implements ActivityPub!)
 | 
					Mastodon is a **free, open-source social network server** based on ActivityPub where users can follow friends and discover new ones. On Mastodon, users can publish anything they want: links, pictures, text, video. All Mastodon servers are interoperable as a federated network (users on one server can seamlessly communicate with users from another one, including non-Mastodon software that implements ActivityPub!)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -30,6 +28,7 @@ Click below to **learn more** in a video:
 | 
				
			||||||
- [View sponsors](https://joinmastodon.org/sponsors)
 | 
					- [View sponsors](https://joinmastodon.org/sponsors)
 | 
				
			||||||
- [Blog](https://blog.joinmastodon.org)
 | 
					- [Blog](https://blog.joinmastodon.org)
 | 
				
			||||||
- [Documentation](https://docs.joinmastodon.org)
 | 
					- [Documentation](https://docs.joinmastodon.org)
 | 
				
			||||||
 | 
					- [Official Docker image](https://github.com/mastodon/mastodon/pkgs/container/mastodon)
 | 
				
			||||||
- [Browse Mastodon servers](https://joinmastodon.org/communities)
 | 
					- [Browse Mastodon servers](https://joinmastodon.org/communities)
 | 
				
			||||||
- [Browse Mastodon apps](https://joinmastodon.org/apps)
 | 
					- [Browse Mastodon apps](https://joinmastodon.org/apps)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -56,7 +56,7 @@ services:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  web:
 | 
					  web:
 | 
				
			||||||
    build: .
 | 
					    build: .
 | 
				
			||||||
    image: tootsuite/mastodon
 | 
					    image: ghcr.io/mastodon/mastodon
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    env_file: .env.production
 | 
					    env_file: .env.production
 | 
				
			||||||
    command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
 | 
					    command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
 | 
				
			||||||
| 
						 | 
					@ -77,7 +77,7 @@ services:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  streaming:
 | 
					  streaming:
 | 
				
			||||||
    build: .
 | 
					    build: .
 | 
				
			||||||
    image: tootsuite/mastodon
 | 
					    image: ghcr.io/mastodon/mastodon
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    env_file: .env.production
 | 
					    env_file: .env.production
 | 
				
			||||||
    command: node ./streaming
 | 
					    command: node ./streaming
 | 
				
			||||||
| 
						 | 
					@ -95,7 +95,7 @@ services:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  sidekiq:
 | 
					  sidekiq:
 | 
				
			||||||
    build: .
 | 
					    build: .
 | 
				
			||||||
    image: tootsuite/mastodon
 | 
					    image: ghcr.io/mastodon/mastodon
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    env_file: .env.production
 | 
					    env_file: .env.production
 | 
				
			||||||
    command: bundle exec sidekiq
 | 
					    command: bundle exec sidekiq
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue