Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion dev-environments/grpc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev-environments/http-proxy-plain-http-upstream/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev-environments/https-proxy-upstream-tlsv1.3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev-environments/keycloak-env/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev-environments/listen-tls/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev-environments/plain-http-upstream/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev-environments/upstream-tlsv1.3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down