From ea488cf74233dade775b587639934df59a6619e0 Mon Sep 17 00:00:00 2001
From: Alex Ellis <alexellis2@gmail.com>
Date: Mon, 9 Jan 2017 17:34:24 +0000
Subject: [PATCH] - Extend stack to include a test function - Allow _ char in
 routes - Let Dockerfile shrink by coming from alpine

---
 docker-compose.yml | 18 ++++++++++++++++--
 gateway/Dockerfile |  1 -
 gateway/server.go  |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7478f263..d5bff2f1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,10 +4,11 @@ services:
         volumes:
             - "/var/run/docker.sock:/var/run/docker.sock"
         ports:
-            - 3000:8080
-        image: alexellisio/faas-gateway:latest
+            - 8080:8080
+        image: alexellis2/faas-gateway:latest
         networks:
         - functions
+
     prometheus:
         image: quay.io/prometheus/prometheus:latest
         volumes:
@@ -21,7 +22,20 @@ services:
             no_proxy:   "gateway"
         networks:
             - functions
+
+# Sample functions go here.
+    hubstats:
+        image: alexellis2/faas-dockerhubstats:latest
+        depends_on:
+            - gateway
+        networks:
+            - functions
+        environment:
+            no_proxy:   "gateway"
+            https_proxy: $https_proxy
+
 networks:
     functions:
         driver: overlay
+        # Docker does not support this option yet - maybe create outside of the stack and reference as "external"?
         #attachable: true
diff --git a/gateway/Dockerfile b/gateway/Dockerfile
index f337be3a..6084f1ba 100644
--- a/gateway/Dockerfile
+++ b/gateway/Dockerfile
@@ -1,4 +1,3 @@
-FROM golang:1.7.3
 FROM alpine:latest
 
 COPY gateway    .
diff --git a/gateway/server.go b/gateway/server.go
index 6b00b139..e5e74d53 100644
--- a/gateway/server.go
+++ b/gateway/server.go
@@ -185,7 +185,7 @@ func main() {
 	r := mux.NewRouter()
 	r.HandleFunc("/", makeProxy(metricsOptions, false))
 
-	r.HandleFunc("/function/{name:[a-zA-Z]+}", makeProxy(metricsOptions, true))
+	r.HandleFunc("/function/{name:[a-zA-Z_]+}", makeProxy(metricsOptions, true))
 
 	metricsHandler := metrics.PrometheusHandler()
 	r.Handle("/metrics", metricsHandler)