From da9292ad13bbb2c1eb2a264d7b531bf6ead0bf38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Mon, 19 Sep 2016 16:02:24 +0200 Subject: [PATCH 1/9] Remove duplicated sentence. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e1942f9..4a7f02a 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ If you'd like to install it, follow [these directions](https://github.com/opensh The steps in this document assume that you have access to an OpenShift deployment that you can deploy applications on. ###Installation: -These steps assume your OpenShift deployment has the default set of ImageStreams defined. Instructions for installing the default ImageStreams are available [here](http://docs.openshift.org/latest/admin_guide/install/first_steps.html). Instructions for installing the default ImageStreams are available [here](http://docs.openshift.org/latest/admin_guide/install/first_steps.html). If you are defining the set of ImageStreams now, remember to pass in the proper cluster-admin credentials and to create the ImageStreams in the 'openshift' namespace. +These steps assume your OpenShift deployment has the default set of ImageStreams defined. Instructions for installing the default ImageStreams are available [here](http://docs.openshift.org/latest/admin_guide/install/first_steps.html). If you are defining the set of ImageStreams now, remember to pass in the proper cluster-admin credentials and to create the ImageStreams in the 'openshift' namespace. 1. Fork a copy of [ruby-ex](https://github.com/openshift/ruby-ex) 2. Add a Ruby application from your new repository: From bcd619aa839242b780e73c34a10ccec426106bb2 Mon Sep 17 00:00:00 2001 From: guangxuli Date: Fri, 9 Dec 2016 10:22:08 +0800 Subject: [PATCH 2/9] fix some old action/info --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e1942f9..6a7d8ee 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ If you'd like to install it, follow [these directions](https://github.com/opensh The steps in this document assume that you have access to an OpenShift deployment that you can deploy applications on. ###Installation: -These steps assume your OpenShift deployment has the default set of ImageStreams defined. Instructions for installing the default ImageStreams are available [here](http://docs.openshift.org/latest/admin_guide/install/first_steps.html). Instructions for installing the default ImageStreams are available [here](http://docs.openshift.org/latest/admin_guide/install/first_steps.html). If you are defining the set of ImageStreams now, remember to pass in the proper cluster-admin credentials and to create the ImageStreams in the 'openshift' namespace. +These steps assume your OpenShift deployment has the default set of ImageStreams defined. Instructions for installing the default ImageStreams are available [here](https://docs.openshift.org/latest/install_config/imagestreams_templates.html#creating-image-streams-for-openshift-images). If you are defining the set of ImageStreams now, remember to pass in the proper cluster-admin credentials and to create the ImageStreams in the 'openshift' namespace. 1. Fork a copy of [ruby-ex](https://github.com/openshift/ruby-ex) 2. Add a Ruby application from your new repository: @@ -21,7 +21,7 @@ These steps assume your OpenShift deployment has the default set of ImageStreams 4. Once the build is running, watch your build progress - $ oc build-logs ruby-ex-1 + $ oc logs build/ruby-ex-1 5. Wait for ruby-ex pods to start up (this can take a few minutes): From 3fdc70cc16e9b6ad991a9fff6f11de282dbbce01 Mon Sep 17 00:00:00 2001 From: Ankit Raj Date: Mon, 12 Dec 2016 14:59:17 +0530 Subject: [PATCH 3/9] adding some punctuation where it left out --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6a7d8ee..dcdd2f2 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ These steps assume your OpenShift deployment has the default set of ImageStreams $ oc start-build ruby-ex -4. Once the build is running, watch your build progress +4. Once the build is running, watch your build progress: $ oc logs build/ruby-ex-1 @@ -58,7 +58,7 @@ Review some of the common tips and suggestions [here](https://github.com/openshi ###Adding Webhooks and Making Code Changes Since OpenShift V3 does not provide a git repository out of the box, you can configure your github repository to make a webhook call whenever you push your code. -1. From the console navigate to your project +1. From the console navigate to your project. 2. Click on Browse > Builds 3. From the view for your Build click on the link to display your GitHub webhook and copy the url. 4. Navigate to your repository on GitHub and click on repository settings > webhooks From 271e781b9d4388b91076f17c66571f7729255618 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Fri, 5 May 2017 10:26:14 +0200 Subject: [PATCH 4/9] fix markdown header formatting in README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index dcdd2f2..6f5435f 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ If you'd like to install it, follow [these directions](https://github.com/opensh The steps in this document assume that you have access to an OpenShift deployment that you can deploy applications on. -###Installation: +### Installation These steps assume your OpenShift deployment has the default set of ImageStreams defined. Instructions for installing the default ImageStreams are available [here](https://docs.openshift.org/latest/install_config/imagestreams_templates.html#creating-image-streams-for-openshift-images). If you are defining the set of ImageStreams now, remember to pass in the proper cluster-admin credentials and to create the ImageStreams in the 'openshift' namespace. 1. Fork a copy of [ruby-ex](https://github.com/openshift/ruby-ex) @@ -51,11 +51,11 @@ In this case, the IP for ruby-ex is 172.30.97.209 and it is on port 8080. *Note*: you can also get this information from the web console. -###Debugging Unexpected Failures +### Debugging Unexpected Failures Review some of the common tips and suggestions [here](https://github.com/openshift/origin/blob/master/docs/debugging-openshift.md). -###Adding Webhooks and Making Code Changes +### Adding Webhooks and Making Code Changes Since OpenShift V3 does not provide a git repository out of the box, you can configure your github repository to make a webhook call whenever you push your code. 1. From the console navigate to your project. @@ -65,5 +65,5 @@ Since OpenShift V3 does not provide a git repository out of the box, you can con 5. Paste your copied webhook url provided by OpenShift - Thats it! 6. After you save your webhook, if you refresh your settings page you can see the status of the ping that Github sent to OpenShift to verify it can reach the server. -###License +### License This code is dedicated to the public domain to the maximum extent permitted by applicable law, pursuant to [CC0](http://creativecommons.org/publicdomain/zero/1.0/). From 04ffa507d97dfbe500f5537e7aa7cbec724e17a9 Mon Sep 17 00:00:00 2001 From: Corey Daley Date: Wed, 16 Aug 2017 11:08:50 -0400 Subject: [PATCH 5/9] adding ToC --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 6f5435f..4db6e6f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,15 @@ + + + + +- [Ruby Sample App on OpenShift](#ruby-sample-app-on-openshift) + + [Installation](#installation) + + [Debugging Unexpected Failures](#debugging-unexpected-failures) + + [Adding Webhooks and Making Code Changes](#adding-webhooks-and-making-code-changes) + + [License](#license) + + + Ruby Sample App on OpenShift ============================ From 5ce019b7424ff41688d983f3a792c7788a2e71a3 Mon Sep 17 00:00:00 2001 From: Aleksandar Kostadinov Date: Thu, 14 Sep 2017 03:52:14 +0800 Subject: [PATCH 6/9] allow viewing request headers (#8) * allow viewing request headers * text/plain output for headers --- config.ru | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/config.ru b/config.ru index a709f06..0c274dc 100755 --- a/config.ru +++ b/config.ru @@ -11,6 +11,19 @@ map '/lobster' do run Rack::Lobster.new end +map '/headers' do + headers = proc do |env| + [200, { "Content-Type" => "text/plain" }, [ + env.select {|key,val| key.start_with? 'HTTP_'} + .collect {|key, val| [key.sub(/^HTTP_/, ''), val]} + .collect {|key, val| "#{key}: #{val}"} + .sort + .join("\n") + ]] + end + run headers +end + map '/' do welcome = proc do |env| [200, { "Content-Type" => "text/html" }, [< Date: Thu, 21 Sep 2017 09:11:12 +0200 Subject: [PATCH 7/9] Update versions for gems --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7bc119c..fbfe9a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - puma (3.4.0) - rack (1.6.4) + puma (3.10.0) + rack (2.0.3) PLATFORMS ruby From b086e72a1c0f6c952596c18128efcb51e01502f3 Mon Sep 17 00:00:00 2001 From: Jacob Lucky Date: Thu, 12 Oct 2017 13:16:51 -0400 Subject: [PATCH 8/9] Update README to reference Ruby 2.4 Ruby 2.0 is now deprecated: https://access.redhat.com/articles/2176281 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4db6e6f..bf96958 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ These steps assume your OpenShift deployment has the default set of ImageStreams 1. Fork a copy of [ruby-ex](https://github.com/openshift/ruby-ex) 2. Add a Ruby application from your new repository: - $ oc new-app openshift/ruby-20-centos7~https://github.com/< yourusername >/ruby-ex + $ oc new-app openshift/ruby-24-centos7~https://github.com/< yourusername >/ruby-ex 3. A build should start immediately. To run another build, run: From 517019c0e77fca7fd214e08d11e3bc076ec06aee Mon Sep 17 00:00:00 2001 From: Marcel Hild Date: Thu, 7 Dec 2017 20:46:55 +0100 Subject: [PATCH 9/9] added required change of Content type otherwise the delivery would fail with unsupported Content-Type application/x-www-form-urlencoded --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bf96958..cb62b7e 100644 --- a/README.md +++ b/README.md @@ -74,8 +74,9 @@ Since OpenShift V3 does not provide a git repository out of the box, you can con 2. Click on Browse > Builds 3. From the view for your Build click on the link to display your GitHub webhook and copy the url. 4. Navigate to your repository on GitHub and click on repository settings > webhooks -5. Paste your copied webhook url provided by OpenShift - Thats it! -6. After you save your webhook, if you refresh your settings page you can see the status of the ping that Github sent to OpenShift to verify it can reach the server. +5. Paste your copied webhook url provided by OpenShift +6. Change the Content type to `application/json` - Thats it! +7. After you save your webhook, if you refresh your settings page you can see the status of the ping that Github sent to OpenShift to verify it can reach the server. ### License This code is dedicated to the public domain to the maximum extent permitted by applicable law, pursuant to [CC0](http://creativecommons.org/publicdomain/zero/1.0/).