From adf1c3bd9a2feb02227b5468bc0559deb34b60bf Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Fri, 9 Sep 2022 06:56:32 -0400 Subject: Add freshrss network when creating container (#4592) This will ease the connection between freshrss container and other containers. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7777bdfc1..6216dfcec 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ ifndef TAG endif PORT ?= 8080 +NETWORK ?= freshrss-network ifdef NO_DOCKER PHP = $(shell which php) @@ -38,6 +39,7 @@ build: ## Build a Docker image .PHONY: start 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)) docker run \ --rm \ @@ -46,11 +48,13 @@ start: ## Start the development environment (use Docker) --publish $(PORT):80 \ --env FRESHRSS_ENV=development \ --name freshrss-dev \ + --network $(NETWORK) \ freshrss/freshrss:$(TAG) .PHONY: stop stop: ## Stop FreshRSS container if any - docker stop freshrss-dev + docker stop freshrss-dev || true + docker network rm $(NETWORK) || true ###################### ## Tests and linter ## -- cgit v1.2.3