From 043df0e057c46ffe17e1fff998d086d29e0bf662 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Mon, 3 Aug 2015 15:38:58 +0200 Subject: [PATCH 1/2] Convert guestbook example to relative urls --- examples/guestbook/README.md | 2 +- examples/guestbook/frontend-controller.yaml | 2 +- examples/guestbook/php-redis/controllers.js | 4 ++-- examples/guestbook/php-redis/index.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/guestbook/README.md b/examples/guestbook/README.md index 1271fba619c..445e89b42f7 100644 --- a/examples/guestbook/README.md +++ b/examples/guestbook/README.md @@ -393,7 +393,7 @@ spec: spec: containers: - name: php-redis - image: kubernetes/example-guestbook-php-redis:v2 + image: kubernetes/example-guestbook-php-redis:v3 ports: - containerPort: 80 ``` diff --git a/examples/guestbook/frontend-controller.yaml b/examples/guestbook/frontend-controller.yaml index 56df5f08a0c..4660d054dd7 100644 --- a/examples/guestbook/frontend-controller.yaml +++ b/examples/guestbook/frontend-controller.yaml @@ -15,6 +15,6 @@ spec: spec: containers: - name: php-redis - image: kubernetes/example-guestbook-php-redis:v2 + image: kubernetes/example-guestbook-php-redis:v3 ports: - containerPort: 80 diff --git a/examples/guestbook/php-redis/controllers.js b/examples/guestbook/php-redis/controllers.js index 1ea5bdce18f..48481fd5d46 100644 --- a/examples/guestbook/php-redis/controllers.js +++ b/examples/guestbook/php-redis/controllers.js @@ -9,7 +9,7 @@ RedisController.prototype.onRedis = function() { this.scope_.messages.push(this.scope_.msg); this.scope_.msg = ""; var value = this.scope_.messages.join(); - this.http_.get("/index.php?cmd=set&key=messages&value=" + value) + this.http_.get("index.php?cmd=set&key=messages&value=" + value) .success(angular.bind(this, function(data) { this.scope_.redisResponse = "Updated."; })); @@ -21,7 +21,7 @@ redisApp.controller('RedisCtrl', function ($scope, $http, $location) { $scope.controller.location_ = $location; $scope.controller.http_ = $http; - $scope.controller.http_.get("/index.php?cmd=get&key=messages") + $scope.controller.http_.get("index.php?cmd=get&key=messages") .success(function(data) { console.log(data); $scope.messages = data.data.split(","); diff --git a/examples/guestbook/php-redis/index.html b/examples/guestbook/php-redis/index.html index 81328b4fcd8..fe457984874 100644 --- a/examples/guestbook/php-redis/index.html +++ b/examples/guestbook/php-redis/index.html @@ -3,7 +3,7 @@ Guestbook - + From 227f8de5a4a219b97c13e9cdb917fdfae2e6de21 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Thu, 6 Aug 2015 23:29:59 +0200 Subject: [PATCH 2/2] Switch to gcr.io Docker registry --- examples/guestbook/README.md | 2 +- examples/guestbook/frontend-controller.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/guestbook/README.md b/examples/guestbook/README.md index 445e89b42f7..c93cbece6b4 100644 --- a/examples/guestbook/README.md +++ b/examples/guestbook/README.md @@ -393,7 +393,7 @@ spec: spec: containers: - name: php-redis - image: kubernetes/example-guestbook-php-redis:v3 + image: gcr.io/google_containers/example-guestbook-php-redis:v3 ports: - containerPort: 80 ``` diff --git a/examples/guestbook/frontend-controller.yaml b/examples/guestbook/frontend-controller.yaml index 4660d054dd7..c5e666f058a 100644 --- a/examples/guestbook/frontend-controller.yaml +++ b/examples/guestbook/frontend-controller.yaml @@ -15,6 +15,6 @@ spec: spec: containers: - name: php-redis - image: kubernetes/example-guestbook-php-redis:v3 + image: gcr.io/google_containers/example-guestbook-php-redis:v3 ports: - containerPort: 80