Merge pull request 'build: 🏗️ 调整构建方式,从本地构建后上传dist目录' (#86) from ci into develop
	
		
			
	
		
	
	
		
	
		
			Some checks failed
		
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is failing
				
			
		
		
	
	
				
					
				
			
		
			Some checks failed
		
		
	
	continuous-integration/drone/push Build is failing
				
			Reviewed-on: #86
This commit is contained in:
		@@ -1,7 +1,6 @@
 | 
			
		||||
.vscode/
 | 
			
		||||
.idea/
 | 
			
		||||
node_modules/
 | 
			
		||||
dist/
 | 
			
		||||
**/*.log
 | 
			
		||||
LICENSE
 | 
			
		||||
README.md
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -1,6 +1,5 @@
 | 
			
		||||
.DS_Store
 | 
			
		||||
node_modules/
 | 
			
		||||
dist/
 | 
			
		||||
npm-debug.log*
 | 
			
		||||
yarn-debug.log*
 | 
			
		||||
yarn-error.log*
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										18
									
								
								Dockerfile
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								Dockerfile
									
									
									
									
									
								
							@@ -1,10 +1,14 @@
 | 
			
		||||
FROM node:12 AS builder
 | 
			
		||||
WORKDIR /app
 | 
			
		||||
ADD package.json /app/
 | 
			
		||||
RUN npm config set registry https://registry.npmmirror.com && npm install git+https://gitee.com/shihairong/raphael && npm install 
 | 
			
		||||
ADD . /app
 | 
			
		||||
RUN npm run build:prod
 | 
			
		||||
#FROM node:12 AS builder
 | 
			
		||||
#WORKDIR /app
 | 
			
		||||
#ADD package.json /app/
 | 
			
		||||
#RUN npm config set registry https://registry.npmmirror.com && npm install git+https://gitee.com/shihairong/raphael && npm install 
 | 
			
		||||
#ADD . /app
 | 
			
		||||
#RUN npm run build:prod
 | 
			
		||||
#
 | 
			
		||||
#FROM busybox
 | 
			
		||||
#LABEL maintainer thomas.hairong@gmail.com
 | 
			
		||||
#COPY --from=builder /app/dist /html
 | 
			
		||||
 | 
			
		||||
FROM busybox
 | 
			
		||||
LABEL maintainer thomas.hairong@gmail.com
 | 
			
		||||
COPY --from=builder /app/dist /html
 | 
			
		||||
COPY dist/ /html
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user