merge to update docker and git pipeline
This commit is contained in:
		
						commit
						536b1cf90e
					
				
							
								
								
									
										7
									
								
								.dockerignore
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								.dockerignore
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,7 @@ | ||||
| pelican | ||||
| __pycache__ | ||||
| *.pyc | ||||
| *.o | ||||
| output/ | ||||
| node_modules/ | ||||
| .venv/ | ||||
							
								
								
									
										18
									
								
								.gitlab-ci.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								.gitlab-ci.yml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,18 @@ | ||||
| stages: | ||||
|   - build | ||||
|   - test | ||||
|   - deploy | ||||
| 
 | ||||
| image: docker:19.03.12 | ||||
| 
 | ||||
| before_script: | ||||
|   - docker info | ||||
|   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY | ||||
| 
 | ||||
| build: | ||||
|   stage: build | ||||
|   tags: | ||||
|     - integration | ||||
|   script: | ||||
|     - docker build -t $CI_REGISTRY_IMAGE:${TAG:-latest} .  | ||||
|     - docker push $CI_REGISTRY_IMAGE:${TAG:-latest} | ||||
| @ -16,4 +16,6 @@ FROM openresty/openresty:buster-fat | ||||
| 
 | ||||
| COPY --from=build /app/output /var/www/pelican/output/  | ||||
| 
 | ||||
| EXPOSE 80 | ||||
| 
 | ||||
| COPY nginx.conf /etc/nginx/conf.d/default.conf | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user