From 4ea619de8383ddcd8c698be0690a02378271b0c9 Mon Sep 17 00:00:00 2001 From: Paul Michali Date: Tue, 6 Mar 2018 12:08:35 +0000 Subject: [PATCH] IPv6: Bookinfo sample Modify bookinfo to use IPv6 any address to run in IPv6 only environment. Changes to build_push_update_images.sh to use developer's docker hub area, so that customized version can be used. To upstream, this should be made configurable. --- samples/bookinfo/build_push_update_images.sh | 12 ++++++++++-- samples/bookinfo/src/details/details.rb | 2 +- samples/bookinfo/src/productpage/productpage.py | 2 +- samples/bookinfo/src/ratings/ratings.js | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/samples/bookinfo/build_push_update_images.sh b/samples/bookinfo/build_push_update_images.sh index 75ea574a1221..1b853fcbdc25 100755 --- a/samples/bookinfo/build_push_update_images.sh +++ b/samples/bookinfo/build_push_update_images.sh @@ -23,8 +23,16 @@ if [ "$#" -ne 1 ]; then fi VERSION=$1 +echo "Building images" src/build-services.sh $VERSION IMAGES=$(docker images -f reference=istio/examples-bookinfo*:$VERSION --format "{{.Repository}}:$VERSION") -for IMAGE in $IMAGES; do docker push $IMAGE; done -sed -i "s/\(istio\/examples-bookinfo-.*\):[[:digit:]]\.[[:digit:]]\.[[:digit:]]/\1:$VERSION/g" */bookinfo*.yaml +REMOTES=`echo ${IMAGES} | sed "s/istio\///g"` +echo "Tagging and pushing to repo $HUB" +for IMAGE in $IMAGES; do + remote=`echo $IMAGE | sed "s/istio\///"` + docker tag $IMAGE $HUB/$remote + docker push $HUB/$remote +done +echo "Modifying image location (${HUB}) in YAML files" +sed -i "s/istio\(\/examples-bookinfo-.*\):[[:digit:]]\.[[:digit:]]\.[[:digit:]]/docker.io\/$GITHUB_USER\1:$VERSION/g" */bookinfo*.yaml diff --git a/samples/bookinfo/src/details/details.rb b/samples/bookinfo/src/details/details.rb index 7ae51797c2c2..6c59e41a616a 100755 --- a/samples/bookinfo/src/details/details.rb +++ b/samples/bookinfo/src/details/details.rb @@ -25,7 +25,7 @@ port = Integer(ARGV[0]) -server = WEBrick::HTTPServer.new :BindAddress => '0.0.0.0', :Port => port +server = WEBrick::HTTPServer.new :BindAddress => '::', :Port => port trap 'INT' do server.shutdown end diff --git a/samples/bookinfo/src/productpage/productpage.py b/samples/bookinfo/src/productpage/productpage.py index 56ba5c821d0e..ad0d1c79f9b3 100644 --- a/samples/bookinfo/src/productpage/productpage.py +++ b/samples/bookinfo/src/productpage/productpage.py @@ -254,5 +254,5 @@ def write(self, data): sys.stderr = Writer('stderr.log') sys.stdout = Writer('stdout.log') print "start at port %s" % (p) - app.run(host='0.0.0.0', port=p, debug=True, threaded=True) + app.run(host='::', port=p, debug=True, threaded=True) diff --git a/samples/bookinfo/src/ratings/ratings.js b/samples/bookinfo/src/ratings/ratings.js index 5f50d4294305..b2a284de2092 100644 --- a/samples/bookinfo/src/ratings/ratings.js +++ b/samples/bookinfo/src/ratings/ratings.js @@ -140,5 +140,5 @@ function handleRequest (request, response) { var server = http.createServer(handleRequest) server.listen(port, function () { - console.log('Server listening on: http://0.0.0.0:%s', port) + console.log('Server listening on: http://[::]:%s', port) })