diff --git a/README.md b/README.md index 2e67fb0..2979dd7 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ You can create a new OpenShift application using the web console or by running t Pointing `oc new-app` at source code kicks off a chain of events, for our example run: - $ oc new-app https://github.com/openshift/nodejs-ex -l name=myapp + $ oc new-app https://github.com/sclorg/nodejs-ex -l name=myapp The tool will inspect the source code, locate an appropriate image on DockerHub, create an ImageStream for that image, and then create the right build configuration, deployment configuration and service definition. @@ -95,9 +95,9 @@ The tool will inspect the source code, locate an appropriate image on DockerHub, #### Create a new app from a template (method 2) -We can also [create new apps using OpenShift template files](https://docs.openshift.com/enterprise/3.0/dev_guide/new_app.html#specifying-a-template). Clone the demo app source code from [GitHub repo](https://github.com/openshift/nodejs-ex) (fork if you like). +We can also [create new apps using OpenShift template files](https://docs.openshift.com/enterprise/3.0/dev_guide/new_app.html#specifying-a-template). Clone the demo app source code from [GitHub repo](https://github.com/sclorg/nodejs-ex) (fork if you like). - $ git clone https://github.com/openshift/nodejs-ex + $ git clone https://github.com/sclorg/nodejs-ex Looking at the repo, you'll notice three files in the openshift/template directory: @@ -133,7 +133,7 @@ Which should return something like: svc/nodejs-ex - 172.30.108.183:8080 dc/nodejs-ex deploys istag/nodejs-ex:latest <- - bc/nodejs-ex builds https://github.com/openshift/nodejs-ex with openshift/nodejs:0.10 + bc/nodejs-ex builds https://github.com/sclorg/nodejs-ex with openshift/nodejs:0.10 build #1 running for 7 seconds deployment #1 waiting on image or update @@ -193,7 +193,7 @@ Running `oc status` or checking the web console will reveal the address of the n http://10.2.2.2 to pod port 8080-tcp (svc/nodejs-ex) dc/nodejs-ex deploys istag/nodejs-ex:latest <- - bc/nodejs-ex builds https://github.com/openshift/nodejs-ex with openshift/nodejs:0.10 + bc/nodejs-ex builds https://github.com/sclorg/nodejs-ex with openshift/nodejs:0.10 deployment #1 deployed 14 minutes ago - 1 pod Note that the url for our new Mongo instance, for our example, is `172.30.0.112:27017`, yours will likely differ. @@ -216,7 +216,7 @@ Then check `oc status` to see that an updated deployment has been kicked off: http://10.2.2.2 to pod port 8080-tcp (svc/nodejs-ex) dc/nodejs-ex deploys istag/nodejs-ex:latest <- - bc/nodejs-ex builds https://github.com/openshift/nodejs-ex with openshift/nodejs:0.10 + bc/nodejs-ex builds https://github.com/sclorg/nodejs-ex with openshift/nodejs:0.10 deployment #2 deployed about a minute ago - 1 pod deployment #1 deployed 2 hours ago diff --git a/helm/nodejs/Chart.yaml b/helm/nodejs/Chart.yaml index 18c8d40..ef91e80 100755 --- a/helm/nodejs/Chart.yaml +++ b/helm/nodejs/Chart.yaml @@ -1,9 +1,9 @@ name: nodejs version: 0.1 -description: An example Node.js application with no database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md. +description: An example Node.js application with no database. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/nodejs-ex/blob/master/README.md. keywords: - quickstart - nodejs home: https://access.redhat.com sources: -- https://github.com/openshift/nodejs-ex +- https://github.com/sclorg/nodejs-ex diff --git a/helm/nodejs/templates/NOTES.txt b/helm/nodejs/templates/NOTES.txt index 94c70dd..69cffbf 100644 --- a/helm/nodejs/templates/NOTES.txt +++ b/helm/nodejs/templates/NOTES.txt @@ -1,3 +1,3 @@ The following service(s) have been created in your project: {{ .Values.name }}. -For more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md. +For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/nodejs-ex/blob/master/README.md. diff --git a/helm/nodejs/values.yaml b/helm/nodejs/values.yaml index 2a2509c..0eb7792 100644 --- a/helm/nodejs/values.yaml +++ b/helm/nodejs/values.yaml @@ -5,7 +5,7 @@ namespace: openshift # Memory Limit: Maximum amount of memory the container can use. memory_limit: 512Mi # Git Repository URL: The URL of the repository with your application source code. -source_repository_url: https://github.com/openshift/nodejs-ex.git +source_repository_url: https://github.com/sclorg/nodejs-ex.git # Git Reference: Set this to a branch name, tag or other ref of your repository if you are not using the default branch. source_repository_ref: # Context Directory: Set this to the relative path to your project if it is not in the root of your repository. diff --git a/openshift/pipeline/README.md b/openshift/pipeline/README.md index bc5e366..45f8f6b 100644 --- a/openshift/pipeline/README.md +++ b/openshift/pipeline/README.md @@ -5,10 +5,10 @@ To do this, run: ```bash # create the nodejs example as usual -oc new-app https://github.com/openshift/nodejs-ex +oc new-app https://github.com/sclorg/nodejs-ex # now create the pipeline build controller from the openshift/pipeline # subdirectory -oc new-app https://github.com/openshift/nodejs-ex \ +oc new-app https://github.com/sclorg/nodejs-ex \ --context-dir=openshift/pipeline --name nodejs-ex-pipeline ``` diff --git a/openshift/templates/nodejs-mongodb-persistent.json b/openshift/templates/nodejs-mongodb-persistent.json index 9ffe375..20f6bba 100644 --- a/openshift/templates/nodejs-mongodb-persistent.json +++ b/openshift/templates/nodejs-mongodb-persistent.json @@ -5,17 +5,17 @@ "name": "nodejs-mongo-persistent", "annotations": { "openshift.io/display-name": "Node.js + MongoDB", - "description": "An example Node.js application with a MongoDB database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.", + "description": "An example Node.js application with a MongoDB database. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/nodejs-ex/blob/master/README.md.", "tags": "quickstart,nodejs", "iconClass": "icon-nodejs", "openshift.io/long-description": "This template defines resources needed to develop a NodeJS application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", - "openshift.io/documentation-url": "https://github.com/openshift/nodejs-ex", + "openshift.io/documentation-url": "https://github.com/sclorg/nodejs-ex", "openshift.io/support-url": "https://access.redhat.com", "template.openshift.io/bindable": "false" } }, - "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.", + "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/nodejs-ex/blob/master/README.md.", "labels": { "template": "nodejs-mongo-persistent" }, @@ -488,7 +488,7 @@ "displayName": "Git Repository URL", "description": "The URL of the repository with your application source code.", "required": true, - "value": "https://github.com/openshift/nodejs-ex.git" + "value": "https://github.com/sclorg/nodejs-ex.git" }, { "name": "SOURCE_REPOSITORY_REF", diff --git a/openshift/templates/nodejs-mongodb.json b/openshift/templates/nodejs-mongodb.json index e2d70bf..f15fab6 100644 --- a/openshift/templates/nodejs-mongodb.json +++ b/openshift/templates/nodejs-mongodb.json @@ -5,17 +5,17 @@ "name": "nodejs-mongodb-example", "annotations": { "openshift.io/display-name": "Node.js + MongoDB (Ephemeral)", - "description": "An example Node.js application with a MongoDB database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing.", + "description": "An example Node.js application with a MongoDB database. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/nodejs-ex/blob/master/README.md.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing.", "tags": "quickstart,nodejs", "iconClass": "icon-nodejs", "openshift.io/long-description": "This template defines resources needed to develop a NodeJS application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", - "openshift.io/documentation-url": "https://github.com/openshift/nodejs-ex", + "openshift.io/documentation-url": "https://github.com/sclorg/nodejs-ex", "openshift.io/support-url": "https://access.redhat.com", "template.openshift.io/bindable": "false" } }, - "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.", + "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/nodejs-ex/blob/master/README.md.", "labels": { "template": "nodejs-mongodb-example", "app": "nodejs-mongodb-example" @@ -465,7 +465,7 @@ "displayName": "Git Repository URL", "description": "The URL of the repository with your application source code.", "required": true, - "value": "https://github.com/openshift/nodejs-ex.git" + "value": "https://github.com/sclorg/nodejs-ex.git" }, { "name": "SOURCE_REPOSITORY_REF", diff --git a/openshift/templates/nodejs.json b/openshift/templates/nodejs.json index bfd7b6b..a94be15 100644 --- a/openshift/templates/nodejs.json +++ b/openshift/templates/nodejs.json @@ -5,17 +5,17 @@ "name": "nodejs-example", "annotations": { "openshift.io/display-name": "Node.js", - "description": "An example Node.js application with no database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.", + "description": "An example Node.js application with no database. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/nodejs-ex/blob/master/README.md.", "tags": "quickstart,nodejs", "iconClass": "icon-nodejs", "openshift.io/long-description": "This template defines resources needed to develop a NodeJS application, including a build configuration and application deployment configuration. It does not include a database.", "openshift.io/provider-display-name": "Red Hat, Inc.", - "openshift.io/documentation-url": "https://github.com/openshift/nodejs-ex", + "openshift.io/documentation-url": "https://github.com/sclorg/nodejs-ex", "openshift.io/support-url": "https://access.redhat.com", "template.openshift.io/bindable": "false" } }, - "message": "The following service(s) have been created in your project: ${NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.", + "message": "The following service(s) have been created in your project: ${NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/nodejs-ex/blob/master/README.md.", "labels": { "template": "nodejs-example", "app": "nodejs-example" @@ -250,7 +250,7 @@ "displayName": "Git Repository URL", "description": "The URL of the repository with your application source code.", "required": true, - "value": "https://github.com/openshift/nodejs-ex.git" + "value": "https://github.com/sclorg/nodejs-ex.git" }, { "name": "SOURCE_REPOSITORY_REF", diff --git a/package.json b/package.json index d802fd6..c318863 100644 --- a/package.json +++ b/package.json @@ -23,12 +23,12 @@ }, "repository": { "type": "git", - "url": "http://github.com/openshift/nodejs-ex.git" + "url": "http://github.com/sclorg/nodejs-ex.git" }, "author": "Steve Speicher ", "license": "CC-BY-1.0", "bugs": { - "url": "http://github.com/openshift/nodejs-ex/issues" + "url": "http://github.com/sclorg/nodejs-ex/issues" }, - "homepage": "http://github.com/openshift/nodejs-ex" + "homepage": "http://github.com/sclorg/nodejs-ex" } diff --git a/views/index.html b/views/index.html index aea7910..e8d2680 100644 --- a/views/index.html +++ b/views/index.html @@ -228,7 +228,7 @@ pre {

Deploying code changes

- The source code for this application is available to be forked from the OpenShift GitHub repository. + The source code for this application is available to be forked from the OpenShift GitHub repository. You can configure a webhook in your repository to make OpenShift automatically start a build whenever you push your code: