[chore] make: fix restart, add redeploy targets (#1397)

* fix restart, add redeploy

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* fix restart, add redeploy

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* use service or SERVICE

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

Author: puckpuck

CHANGELOG.md

@@ -7,6 +7,9 @@ the release.
 
 ## Unreleased
 
+* [chore] fix Make targets for restart and redeploy
+  ([#1397](https://github.com/open-telemetry/opentelemetry-demo/pull/1397))
+
 ## 1.8.0
 
 * [grafana] update grafana to 10.2.3

Makefile

@@ -164,10 +164,40 @@ stop:
 	@echo ""
 	@echo "OpenTelemetry Demo is stopped."
 
-
-# Use to rebuild and restart a single service component
+# Use to restart a single service component
 # Example: make restart service=frontend
 .PHONY: restart
 restart:
-	# work with `service` or `SERVICE` as input
-	./restart-service.sh ${service}${SERVICE}
+# work with `service` or `SERVICE` as input
+ifdef SERVICE
+	service := $(SERVICE)
+endif
+
+ifdef service
+	docker compose stop $(service)
+	docker compose rm --force $(service)
+	docker compose create $(service)
+	docker compose start $(service)
+else
+	@echo "Please provide a service name using `service=[service name]` or `SERVICE=[service name]`"
+endif
+
+# Use to rebuild and restart (redeploy) a single service component
+# Example: make redeploy service=frontend
+.PHONY: redeploy
+redeploy:
+# work with `service` or `SERVICE` as input
+ifdef SERVICE
+	service := $(SERVICE)
+endif
+
+ifdef service
+	docker compose build $(service)
+	docker compose stop $(service)
+	docker compose rm --force $(service)
+	docker compose create $(service)
+	docker compose start $(service)
+else
+	@echo "Please provide a service name using `service=[service name]` or `SERVICE=[service name]`"
+endif
+