chore(docker-compose): 推奨の名前にする (#14096)
* chore(docker-compose): 推奨の名前にする
5c18e329d5/spec.md (compose-file)
* yaml to yml
* fix
* fix
			
			
This commit is contained in:
		
							parent
							
								
									4096dabe1e
								
							
						
					
					
						commit
						a6edd50a5d
					
				
					 9 changed files with 7 additions and 15 deletions
				
			
		| 
						 | 
					@ -1,5 +1,3 @@
 | 
				
			||||||
version: '3.8'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  app:
 | 
					  app:
 | 
				
			||||||
    build:
 | 
					    build:
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	"name": "Misskey",
 | 
						"name": "Misskey",
 | 
				
			||||||
	"dockerComposeFile": "docker-compose.yml",
 | 
						"dockerComposeFile": "compose.yml",
 | 
				
			||||||
	"service": "app",
 | 
						"service": "app",
 | 
				
			||||||
	"workspaceFolder": "/workspace",
 | 
						"workspaceFolder": "/workspace",
 | 
				
			||||||
	"features": {
 | 
						"features": {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,7 +7,7 @@ Dockerfile
 | 
				
			||||||
build/
 | 
					build/
 | 
				
			||||||
built/
 | 
					built/
 | 
				
			||||||
db/
 | 
					db/
 | 
				
			||||||
docker-compose.yml
 | 
					.devcontainer/compose.yml
 | 
				
			||||||
node_modules/
 | 
					node_modules/
 | 
				
			||||||
packages/*/node_modules
 | 
					packages/*/node_modules
 | 
				
			||||||
redis/
 | 
					redis/
 | 
				
			||||||
| 
						 | 
					@ -28,4 +28,4 @@ fluent-emojis/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.idea/
 | 
					.idea/
 | 
				
			||||||
packages/*/.vscode/
 | 
					packages/*/.vscode/
 | 
				
			||||||
packages/backend/test/docker-compose.yml
 | 
					packages/backend/test/compose.yml
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								.github/workflows/dockle.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/dockle.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -22,7 +22,7 @@ jobs:
 | 
				
			||||||
          sudo dpkg -i dockle.deb
 | 
					          sudo dpkg -i dockle.deb
 | 
				
			||||||
      - run: |
 | 
					      - run: |
 | 
				
			||||||
          cp .config/docker_example.env .config/docker.env
 | 
					          cp .config/docker_example.env .config/docker.env
 | 
				
			||||||
          cp ./docker-compose_example.yml ./docker-compose.yml
 | 
					          cp ./compose_example.yml ./compose.yml
 | 
				
			||||||
      - run: |
 | 
					      - run: |
 | 
				
			||||||
          docker compose up -d web
 | 
					          docker compose up -d web
 | 
				
			||||||
          docker tag "$(docker compose images web | awk 'OFS=":" {print $4}' | tail -n +2)" misskey-web:latest
 | 
					          docker tag "$(docker compose images web | awk 'OFS=":" {print $4}' | tail -n +2)" misskey-web:latest
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										4
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -35,8 +35,8 @@ coverage
 | 
				
			||||||
!/.config/example.yml
 | 
					!/.config/example.yml
 | 
				
			||||||
!/.config/docker_example.yml
 | 
					!/.config/docker_example.yml
 | 
				
			||||||
!/.config/docker_example.env
 | 
					!/.config/docker_example.env
 | 
				
			||||||
docker-compose.yml
 | 
					.devcontainer/compose.yml
 | 
				
			||||||
!/.devcontainer/docker-compose.yml
 | 
					!/.devcontainer/compose.yml
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# misskey
 | 
					# misskey
 | 
				
			||||||
/build
 | 
					/build
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -165,7 +165,7 @@ cp .github/misskey/test.yml .config/
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
Prepare DB/Redis for testing.
 | 
					Prepare DB/Redis for testing.
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
docker compose -f packages/backend/test/docker-compose.yml up
 | 
					docker compose -f packages/backend/test/compose.yaml up
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
Alternatively, prepare an empty (data can be erased) DB and edit `.config/test.yml`.
 | 
					Alternatively, prepare an empty (data can be erased) DB and edit `.config/test.yml`.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,3 @@
 | 
				
			||||||
version: "3"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# このconfigは、 dockerでMisskey本体を起動せず、 redisとpostgresql などだけを起動します
 | 
					# このconfigは、 dockerでMisskey本体を起動せず、 redisとpostgresql などだけを起動します
 | 
				
			||||||
 | 
					
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,3 @@
 | 
				
			||||||
version: "3"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  web:
 | 
					  web:
 | 
				
			||||||
    build: .
 | 
					    build: .
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,3 @@
 | 
				
			||||||
version: "3"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  redistest:
 | 
					  redistest:
 | 
				
			||||||
    image: redis:7
 | 
					    image: redis:7
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue