Procházet zdrojové kódy

Add freshrss network when creating container (#4592)

This will ease the connection between freshrss container and other containers.
Alexis Degrugillier před 3 roky
rodič
revize
adf1c3bd9a
1 změnil soubory, kde provedl 5 přidání a 1 odebrání
  1. 5 1
      Makefile

+ 5 - 1
Makefile

@@ -5,6 +5,7 @@ ifndef TAG
 endif
 endif
 
 
 PORT ?= 8080
 PORT ?= 8080
+NETWORK ?= freshrss-network
 
 
 ifdef NO_DOCKER
 ifdef NO_DOCKER
 	PHP = $(shell which php)
 	PHP = $(shell which php)
@@ -38,6 +39,7 @@ build: ## Build a Docker image
 
 
 .PHONY: start
 .PHONY: start
 start: ## Start the development environment (use Docker)
 start: ## Start the development environment (use Docker)
+	docker network create --driver bridge $(NETWORK) || true
 	$(foreach extension,$(extensions),$(eval volumes=$(volumes) --volume $(extension):/var/www/FreshRSS/extensions/$(notdir $(extension)):z))
 	$(foreach extension,$(extensions),$(eval volumes=$(volumes) --volume $(extension):/var/www/FreshRSS/extensions/$(notdir $(extension)):z))
 	docker run \
 	docker run \
 		--rm \
 		--rm \
@@ -46,11 +48,13 @@ start: ## Start the development environment (use Docker)
 		--publish $(PORT):80 \
 		--publish $(PORT):80 \
 		--env FRESHRSS_ENV=development \
 		--env FRESHRSS_ENV=development \
 		--name freshrss-dev \
 		--name freshrss-dev \
+		--network $(NETWORK) \
 		freshrss/freshrss:$(TAG)
 		freshrss/freshrss:$(TAG)
 
 
 .PHONY: stop
 .PHONY: stop
 stop: ## Stop FreshRSS container if any
 stop: ## Stop FreshRSS container if any
-	docker stop freshrss-dev
+	docker stop freshrss-dev || true
+	docker network rm $(NETWORK) || true
 
 
 ######################
 ######################
 ## Tests and linter ##
 ## Tests and linter ##