mirror of
				https://github.com/optim-enterprises-bv/openlan-cgw.git
				synced 2025-11-03 19:57:47 +00:00 
			
		
		
		
	Build: use multi-cgw deployment target as a default one
Replace script-based approach for CGW/services creation, in favor of multi-cgw templated generated compose file. Also, add a new run-tests target, that executes / starts test run, for the sake of convinience. Signed-off-by: Oleksandr Mazur <oleksandr.mazur@plvision.eu>
This commit is contained in:
		
							
								
								
									
										9
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										9
									
								
								Makefile
									
									
									
									
									
								
							@@ -16,9 +16,9 @@ CGW_BUILD_ENV_IMG_TAG := $(shell cat Dockerfile | sha1sum | awk '{print substr($
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
CGW_BUILD_ENV_IMG_CONTAINER_NAME := "cgw_build_env"
 | 
					CGW_BUILD_ENV_IMG_CONTAINER_NAME := "cgw_build_env"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.PHONY: all cgw-app cgw-build-env-img cgw-img stop clean run run_docker_services start-multi-cgw stop-multi-cgw
 | 
					.PHONY: all cgw-app cgw-build-env-img cgw-img stop clean run run_docker_services start-multi-cgw stop-multi-cgw run-tests
 | 
				
			||||||
 | 
					
 | 
				
			||||||
all: cgw-build-env-img run_docker_services run
 | 
					all: start-multi-cgw
 | 
				
			||||||
	@echo "uCentral CGW build app (container) done"
 | 
						@echo "uCentral CGW build app (container) done"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Executed inside build-env
 | 
					# Executed inside build-env
 | 
				
			||||||
@@ -48,7 +48,7 @@ cgw-img: stop cgw-build-env-img
 | 
				
			|||||||
		.
 | 
							.
 | 
				
			||||||
	@echo Docker build done;
 | 
						@echo Docker build done;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
stop:
 | 
					stop: stop-multi-cgw
 | 
				
			||||||
	@echo "Stopping / removing container ${CGW_IMG_CONTAINER_NAME}"
 | 
						@echo "Stopping / removing container ${CGW_IMG_CONTAINER_NAME}"
 | 
				
			||||||
	@docker stop ${CGW_IMG_CONTAINER_NAME} > /dev/null 2>&1 || true;
 | 
						@docker stop ${CGW_IMG_CONTAINER_NAME} > /dev/null 2>&1 || true;
 | 
				
			||||||
	@docker container rm ${CGW_IMG_CONTAINER_NAME} > /dev/null 2>&1 || true;
 | 
						@docker container rm ${CGW_IMG_CONTAINER_NAME} > /dev/null 2>&1 || true;
 | 
				
			||||||
@@ -77,3 +77,6 @@ stop-multi-cgw:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
run_docker_services:
 | 
					run_docker_services:
 | 
				
			||||||
	@cd ./utils/docker/ && docker compose up -d
 | 
						@cd ./utils/docker/ && docker compose up -d
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					run-tests:
 | 
				
			||||||
 | 
						@cd ./tests && ./run.sh
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user