diff --git a/CHANGELOG.md b/CHANGELOG.md index f6e5a5fb2..6d7f8c140 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Fix upstream default port when HTTP_PROXY [PR #1440](https://github.com/3scale/APIcast/pull/1440) +- Docker compose up instead of docker compose run [PR #1442](https://github.com/3scale/APIcast/pull/1442) + ### Added - Detect number of CPU shares when running on Cgroups V2 [PR #1410](https://github.com/3scale/apicast/pull/1410) [THREESCALE-10167](https://issues.redhat.com/browse/THREESCALE-10167) diff --git a/dev-environments/grpc/Makefile b/dev-environments/grpc/Makefile index 74552b571..f658e69f2 100644 --- a/dev-environments/grpc/Makefile +++ b/dev-environments/grpc/Makefile @@ -6,7 +6,7 @@ WORKDIR := $(patsubst %/,%,$(dir $(MKFILE_PATH))) DOCKER ?= $(shell which docker 2> /dev/null || echo "docker") gateway: ## run gateway configured to access upstream powered with TLS - $(DOCKER) compose -f docker-compose.yml run --service-ports gateway + $(DOCKER) compose -f docker-compose.yml up --attach gateway clean: $(DOCKER) compose down --volumes --remove-orphans diff --git a/dev-environments/http-proxy-plain-http-upstream/Makefile b/dev-environments/http-proxy-plain-http-upstream/Makefile index ccd279341..a616c6e74 100644 --- a/dev-environments/http-proxy-plain-http-upstream/Makefile +++ b/dev-environments/http-proxy-plain-http-upstream/Makefile @@ -6,7 +6,7 @@ WORKDIR := $(patsubst %/,%,$(dir $(MKFILE_PATH))) DOCKER ?= $(shell which docker 2> /dev/null || echo "docker") gateway: ## run gateway configured to access upstream powered with TLS - $(DOCKER) compose -f docker-compose.yml run --service-ports gateway + $(DOCKER) compose -f docker-compose.yml up --attach gateway clean: $(DOCKER) compose down --volumes --remove-orphans diff --git a/dev-environments/https-proxy-upstream-tlsv1.3/Makefile b/dev-environments/https-proxy-upstream-tlsv1.3/Makefile index fe6780662..741676947 100644 --- a/dev-environments/https-proxy-upstream-tlsv1.3/Makefile +++ b/dev-environments/https-proxy-upstream-tlsv1.3/Makefile @@ -6,7 +6,7 @@ WORKDIR := $(patsubst %/,%,$(dir $(MKFILE_PATH))) DOCKER ?= $(shell which docker 2> /dev/null || echo "docker") gateway: ## run gateway configured to access upstream powered with TLS - $(DOCKER) compose -f docker-compose.yml run --service-ports gateway + $(DOCKER) compose -f docker-compose.yml up --attach gateway clean: $(DOCKER) compose down --volumes --remove-orphans diff --git a/dev-environments/keycloak-env/Makefile b/dev-environments/keycloak-env/Makefile index 87695cedb..622752bea 100644 --- a/dev-environments/keycloak-env/Makefile +++ b/dev-environments/keycloak-env/Makefile @@ -6,7 +6,7 @@ WORKDIR := $(patsubst %/,%,$(dir $(MKFILE_PATH))) DOCKER ?= $(shell which docker 2> /dev/null || echo "docker") gateway: ## run gateway configured to keycloak integration - $(DOCKER) compose -f docker-compose.yml run --service-ports gateway + $(DOCKER) compose -f docker-compose.yml up --attach gateway keycloak-data: ## Keycloak provisioning # Keycloak 23.0.4 REST API reference diff --git a/dev-environments/listen-tls/Makefile b/dev-environments/listen-tls/Makefile index fe6780662..741676947 100644 --- a/dev-environments/listen-tls/Makefile +++ b/dev-environments/listen-tls/Makefile @@ -6,7 +6,7 @@ WORKDIR := $(patsubst %/,%,$(dir $(MKFILE_PATH))) DOCKER ?= $(shell which docker 2> /dev/null || echo "docker") gateway: ## run gateway configured to access upstream powered with TLS - $(DOCKER) compose -f docker-compose.yml run --service-ports gateway + $(DOCKER) compose -f docker-compose.yml up --attach gateway clean: $(DOCKER) compose down --volumes --remove-orphans diff --git a/dev-environments/opentelemetry-instrumented-gateway/Makefile b/dev-environments/opentelemetry-instrumented-gateway/Makefile index 7e0707631..60f9565e4 100644 --- a/dev-environments/opentelemetry-instrumented-gateway/Makefile +++ b/dev-environments/opentelemetry-instrumented-gateway/Makefile @@ -6,7 +6,7 @@ WORKDIR := $(patsubst %/,%,$(dir $(MKFILE_PATH))) DOCKER ?= $(shell which docker 2> /dev/null || echo "docker") gateway: ## run gateway configured to access plain HTTP 1.1 upstream - $(DOCKER) compose -f docker-compose.yml run --service-ports gateway + $(DOCKER) compose -f docker-compose.yml up --attach gateway clean: $(DOCKER) compose down --volumes --remove-orphans diff --git a/dev-environments/plain-http-upstream/Makefile b/dev-environments/plain-http-upstream/Makefile index 7e0707631..60f9565e4 100644 --- a/dev-environments/plain-http-upstream/Makefile +++ b/dev-environments/plain-http-upstream/Makefile @@ -6,7 +6,7 @@ WORKDIR := $(patsubst %/,%,$(dir $(MKFILE_PATH))) DOCKER ?= $(shell which docker 2> /dev/null || echo "docker") gateway: ## run gateway configured to access plain HTTP 1.1 upstream - $(DOCKER) compose -f docker-compose.yml run --service-ports gateway + $(DOCKER) compose -f docker-compose.yml up --attach gateway clean: $(DOCKER) compose down --volumes --remove-orphans diff --git a/dev-environments/upstream-tlsv1.3/Makefile b/dev-environments/upstream-tlsv1.3/Makefile index fe6780662..741676947 100644 --- a/dev-environments/upstream-tlsv1.3/Makefile +++ b/dev-environments/upstream-tlsv1.3/Makefile @@ -6,7 +6,7 @@ WORKDIR := $(patsubst %/,%,$(dir $(MKFILE_PATH))) DOCKER ?= $(shell which docker 2> /dev/null || echo "docker") gateway: ## run gateway configured to access upstream powered with TLS - $(DOCKER) compose -f docker-compose.yml run --service-ports gateway + $(DOCKER) compose -f docker-compose.yml up --attach gateway clean: $(DOCKER) compose down --volumes --remove-orphans