Merge pull request #1083 from 3scale/merge-master-to-3.6-stable

Bring changes in master to 3.6-stable

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Added
+
+- Extended variables in Liquid template operations [PR #1081](https://github.com/3scale/APIcast/pull/1081) 
+
 ## [3.6.0-beta1] - 2019-06-18
 
 ### Added

Makefile

@@ -18,7 +18,19 @@ RUNTIME_IMAGE ?= $(BUILDER_IMAGE)-runtime
 
 DEVEL_IMAGE ?= apicast-development
 DEVEL_DOCKERFILE ?= Dockerfile-development
+
 DEVEL_DOCKER_COMPOSE_FILE ?= docker-compose-devel.yml
+DEVEL_DOCKER_COMPOSE_VOLMOUNT_MAC_FILE ?= docker-compose-devel-volmount-mac.yml
+DEVEL_DOCKER_COMPOSE_VOLMOUNT_DEFAULT_FILE ?= docker-compose-devel-volmount-default.yml
+
+os = "$(shell uname -s)"
+
+# if running on Mac
+ifeq ($(os),"Darwin")
+    DEVEL_DOCKER_COMPOSE_VOLMOUNT_FILE = $(DEVEL_DOCKER_COMPOSE_VOLMOUNT_MAC_FILE)
+else
+    DEVEL_DOCKER_COMPOSE_VOLMOUNT_FILE = $(DEVEL_DOCKER_COMPOSE_VOLMOUNT_DEFAULT_FILE)
+endif
 
 S2I_CONTEXT ?= gateway
 
@@ -190,12 +202,13 @@ development: USER := $(shell id -u $(USER))
 endif
 development: .docker/lua_modules .docker/local .docker/cpanm .docker/vendor/cache
 development: ## Run bash inside the development image
-	- $(DOCKER_COMPOSE) -f $(DEVEL_DOCKER_COMPOSE_FILE) up --detach
+	@echo "Running on $(os)"
+	- $(DOCKER_COMPOSE) -f $(DEVEL_DOCKER_COMPOSE_FILE) -f $(DEVEL_DOCKER_COMPOSE_VOLMOUNT_FILE) up -d
 	@ # https://github.com/moby/moby/issues/33794#issuecomment-312873988 for fixing the terminal width
-	$(DOCKER_COMPOSE) -f $(DEVEL_DOCKER_COMPOSE_FILE) exec -e COLUMNS="`tput cols`" -e LINES="`tput lines`" --user $(USER) development bash
+	$(DOCKER_COMPOSE) -f $(DEVEL_DOCKER_COMPOSE_FILE) -f $(DEVEL_DOCKER_COMPOSE_VOLMOUNT_FILE) exec -e COLUMNS="`tput cols`" -e LINES="`tput lines`" --user $(USER) development bash
 
 stop-development: ## Stop development environment
-	- $(DOCKER_COMPOSE) -f $(DEVEL_DOCKER_COMPOSE_FILE) down
+	- $(DOCKER_COMPOSE) -f $(DEVEL_DOCKER_COMPOSE_FILE) -f $(DEVEL_DOCKER_COMPOSE_VOLMOUNT_FILE) down
 
 rover: $(ROVER)
 	@echo $(ROVER)

docker-compose-devel-volmount-default.yml

@@ -0,0 +1,7 @@
+version: '2.2'
+services:
+  development:
+    volumes:
+      - .:/home/centos/
+      - .docker/cpanm:/home/centos/.cpanm
+

docker-compose-devel-volmount-mac.yml

@@ -0,0 +1,6 @@
+version: '2.2'
+services:
+  development:
+    volumes:
+      - .:/home/centos/:cached
+      - .docker/cpanm:/home/centos/.cpanm:delegated

docker-compose-devel.yml

@@ -6,11 +6,9 @@ services:
       - redis
     working_dir: /home/centos/
     volumes:
-      - .:/home/centos/:cached
       - .docker/lua_modules:/home/centos/lua_modules
       - .docker/local:/home/centos/local
       - .docker/vendor/cache:/home/centos/vendor/cache
-      - .docker/cpanm:/home/centos/.cpanm:delegated
       # no need to access those from docker
       - /home/centos/.docker
       - /home/centos/.git

gateway/src/apicast/policy/ngx_variable.lua

@@ -7,6 +7,10 @@ local function context_values()
     uri = ngx.var.uri,
     host = ngx.var.host,
     remote_addr = ngx.var.remote_addr,
+    remote_port = ngx.var.remote_port,
+    scheme = ngx.var.scheme,
+    server_addr = ngx.var.server_addr,
+    server_port = ngx.var.server_port,
     headers = ngx.req.get_headers(),
     http_method = ngx.req.get_method(),
   }