parent
							
								
									e8d4f3eac3
								
							
						
					
					
						commit
						1c8419cea0
					
				
					 3 changed files with 26 additions and 8 deletions
				
			
		
							
								
								
									
										8
									
								
								.github/workflows/docker-develop.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/docker-develop.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -15,7 +15,10 @@ jobs:
 | 
				
			||||||
      - name: Check out the repo
 | 
					      - name: Check out the repo
 | 
				
			||||||
        uses: actions/checkout@v3.3.0
 | 
					        uses: actions/checkout@v3.3.0
 | 
				
			||||||
      - name: Set up Docker Buildx
 | 
					      - name: Set up Docker Buildx
 | 
				
			||||||
 | 
					        id: buildx
 | 
				
			||||||
        uses: docker/setup-buildx-action@v2.3.0
 | 
					        uses: docker/setup-buildx-action@v2.3.0
 | 
				
			||||||
 | 
					        with:
 | 
				
			||||||
 | 
					          platforms: linux/amd64,linux/arm64
 | 
				
			||||||
      - name: Docker meta
 | 
					      - name: Docker meta
 | 
				
			||||||
        id: meta
 | 
					        id: meta
 | 
				
			||||||
        uses: docker/metadata-action@v4
 | 
					        uses: docker/metadata-action@v4
 | 
				
			||||||
| 
						 | 
					@ -27,10 +30,13 @@ jobs:
 | 
				
			||||||
          username: ${{ secrets.DOCKER_USERNAME }}
 | 
					          username: ${{ secrets.DOCKER_USERNAME }}
 | 
				
			||||||
          password: ${{ secrets.DOCKER_PASSWORD }}
 | 
					          password: ${{ secrets.DOCKER_PASSWORD }}
 | 
				
			||||||
      - name: Build and Push to Docker Hub
 | 
					      - name: Build and Push to Docker Hub
 | 
				
			||||||
        uses: docker/build-push-action@v3
 | 
					        uses: docker/build-push-action@v4
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
 | 
					          builder: ${{ steps.buildx.outputs.name }}
 | 
				
			||||||
          context: .
 | 
					          context: .
 | 
				
			||||||
          push: true
 | 
					          push: true
 | 
				
			||||||
 | 
					          platforms: ${{ steps.buildx.outputs.platforms }}
 | 
				
			||||||
 | 
					          provenance: false
 | 
				
			||||||
          tags: misskey/misskey:develop
 | 
					          tags: misskey/misskey:develop
 | 
				
			||||||
          labels: develop
 | 
					          labels: develop
 | 
				
			||||||
          cache-from: type=gha
 | 
					          cache-from: type=gha
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										12
									
								
								.github/workflows/docker.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								.github/workflows/docker.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -13,6 +13,11 @@ jobs:
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - name: Check out the repo
 | 
					      - name: Check out the repo
 | 
				
			||||||
        uses: actions/checkout@v3.3.0
 | 
					        uses: actions/checkout@v3.3.0
 | 
				
			||||||
 | 
					      - name: Set up Docker Buildx
 | 
				
			||||||
 | 
					        id: buildx
 | 
				
			||||||
 | 
					        uses: docker/setup-buildx-action@v2.3.0
 | 
				
			||||||
 | 
					        with:
 | 
				
			||||||
 | 
					          platforms: linux/amd64,linux/arm64
 | 
				
			||||||
      - name: Docker meta
 | 
					      - name: Docker meta
 | 
				
			||||||
        id: meta
 | 
					        id: meta
 | 
				
			||||||
        uses: docker/metadata-action@v4
 | 
					        uses: docker/metadata-action@v4
 | 
				
			||||||
| 
						 | 
					@ -31,9 +36,14 @@ jobs:
 | 
				
			||||||
          username: ${{ secrets.DOCKER_USERNAME }}
 | 
					          username: ${{ secrets.DOCKER_USERNAME }}
 | 
				
			||||||
          password: ${{ secrets.DOCKER_PASSWORD }}
 | 
					          password: ${{ secrets.DOCKER_PASSWORD }}
 | 
				
			||||||
      - name: Build and Push to Docker Hub
 | 
					      - name: Build and Push to Docker Hub
 | 
				
			||||||
        uses: docker/build-push-action@v3
 | 
					        uses: docker/build-push-action@v4
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
 | 
					          builder: ${{ steps.buildx.outputs.name }}
 | 
				
			||||||
          context: .
 | 
					          context: .
 | 
				
			||||||
          push: true
 | 
					          push: true
 | 
				
			||||||
 | 
					          platforms: ${{ steps.buildx.outputs.platforms }}
 | 
				
			||||||
 | 
					          provenance: false
 | 
				
			||||||
          tags: ${{ steps.meta.outputs.tags }}
 | 
					          tags: ${{ steps.meta.outputs.tags }}
 | 
				
			||||||
          labels: ${{ steps.meta.outputs.labels }}
 | 
					          labels: ${{ steps.meta.outputs.labels }}
 | 
				
			||||||
 | 
					          cache-from: type=gha
 | 
				
			||||||
 | 
					          cache-to: type=gha,mode=max
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										14
									
								
								Dockerfile
									
										
									
									
									
								
							
							
						
						
									
										14
									
								
								Dockerfile
									
										
									
									
									
								
							| 
						 | 
					@ -1,3 +1,5 @@
 | 
				
			||||||
 | 
					# syntax = docker/dockerfile:1.4
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ARG NODE_VERSION=18.13.0-bullseye
 | 
					ARG NODE_VERSION=18.13.0-bullseye
 | 
				
			||||||
 | 
					
 | 
				
			||||||
FROM node:${NODE_VERSION} AS builder
 | 
					FROM node:${NODE_VERSION} AS builder
 | 
				
			||||||
| 
						 | 
					@ -14,16 +16,16 @@ RUN corepack enable
 | 
				
			||||||
 | 
					
 | 
				
			||||||
WORKDIR /misskey
 | 
					WORKDIR /misskey
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COPY ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"]
 | 
					COPY --link ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"]
 | 
				
			||||||
COPY ["scripts", "./scripts"]
 | 
					COPY --link ["scripts", "./scripts"]
 | 
				
			||||||
COPY ["packages/backend/package.json", "./packages/backend/"]
 | 
					COPY --link ["packages/backend/package.json", "./packages/backend/"]
 | 
				
			||||||
COPY ["packages/frontend/package.json", "./packages/frontend/"]
 | 
					COPY --link ["packages/frontend/package.json", "./packages/frontend/"]
 | 
				
			||||||
COPY ["packages/sw/package.json", "./packages/sw/"]
 | 
					COPY --link ["packages/sw/package.json", "./packages/sw/"]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
 | 
					RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
 | 
				
			||||||
	pnpm i --frozen-lockfile --aggregate-output
 | 
						pnpm i --frozen-lockfile --aggregate-output
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COPY . ./
 | 
					COPY --link . ./
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ARG NODE_ENV=production
 | 
					ARG NODE_ENV=production
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue