fix Dockerfile (#7763)
* fix Dockerfile * remove unnecessary change * add misskey-assets in .dockerignore
This commit is contained in:
		
							parent
							
								
									bf7bacceab
								
							
						
					
					
						commit
						65d9c304df
					
				
					 2 changed files with 10 additions and 19 deletions
				
			
		| 
						 | 
					@ -1,5 +1,4 @@
 | 
				
			||||||
.autogen
 | 
					.autogen
 | 
				
			||||||
.git
 | 
					 | 
				
			||||||
.github
 | 
					.github
 | 
				
			||||||
.travis
 | 
					.travis
 | 
				
			||||||
.vscode
 | 
					.vscode
 | 
				
			||||||
| 
						 | 
					@ -12,3 +11,4 @@ elasticsearch/
 | 
				
			||||||
node_modules/
 | 
					node_modules/
 | 
				
			||||||
redis/
 | 
					redis/
 | 
				
			||||||
files/
 | 
					files/
 | 
				
			||||||
 | 
					misskey-assets/
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										27
									
								
								Dockerfile
									
										
									
									
									
								
							
							
						
						
									
										27
									
								
								Dockerfile
									
										
									
									
									
								
							| 
						 | 
					@ -4,27 +4,17 @@ ENV NODE_ENV=production
 | 
				
			||||||
 | 
					
 | 
				
			||||||
WORKDIR /misskey
 | 
					WORKDIR /misskey
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ENV BUILD_DEPS autoconf automake file g++ gcc libc-dev libtool make nasm pkgconfig python3 zlib-dev git
 | 
				
			||||||
 | 
					
 | 
				
			||||||
FROM base AS builder
 | 
					FROM base AS builder
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN apk add --no-cache \
 | 
					 | 
				
			||||||
    autoconf \
 | 
					 | 
				
			||||||
    automake \
 | 
					 | 
				
			||||||
    file \
 | 
					 | 
				
			||||||
    g++ \
 | 
					 | 
				
			||||||
    gcc \
 | 
					 | 
				
			||||||
    libc-dev \
 | 
					 | 
				
			||||||
    libtool \
 | 
					 | 
				
			||||||
    make \
 | 
					 | 
				
			||||||
    nasm \
 | 
					 | 
				
			||||||
    pkgconfig \
 | 
					 | 
				
			||||||
    python3 \
 | 
					 | 
				
			||||||
    zlib-dev
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
RUN git submodule update --init
 | 
					 | 
				
			||||||
COPY package.json yarn.lock .yarnrc ./
 | 
					 | 
				
			||||||
RUN yarn install
 | 
					 | 
				
			||||||
COPY . ./
 | 
					COPY . ./
 | 
				
			||||||
RUN yarn build
 | 
					
 | 
				
			||||||
 | 
					RUN apk add --no-cache $BUILD_DEPS && \
 | 
				
			||||||
 | 
					    git submodule update --init && \
 | 
				
			||||||
 | 
					    yarn install && \
 | 
				
			||||||
 | 
					    yarn build && \
 | 
				
			||||||
 | 
					    rm -rf .git
 | 
				
			||||||
 | 
					
 | 
				
			||||||
FROM base AS runner
 | 
					FROM base AS runner
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -39,3 +29,4 @@ COPY --from=builder /misskey/built ./built
 | 
				
			||||||
COPY . ./
 | 
					COPY . ./
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CMD ["npm", "run", "migrateandstart"]
 | 
					CMD ["npm", "run", "migrateandstart"]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue