Skip to content

Commit

Permalink
Merge pull request sclorg#191 from adambkaplan/sclorg-rename
Browse files Browse the repository at this point in the history
Rename github org references to sclorg
  • Loading branch information
hhorak authored Jul 24, 2018
2 parents 24e7e68 + 9b0e5f1 commit e79929f
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 28 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,17 @@ 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.

(The -l flag will apply a label of "name=myapp" to all the resources created by new-app, for easy management later.)

#### 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:

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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.
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions helm/nodejs/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion helm/nodejs/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion helm/nodejs/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions openshift/pipeline/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
8 changes: 4 additions & 4 deletions openshift/templates/nodejs-mongodb-persistent.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions openshift/templates/nodejs-mongodb.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions openshift/templates/nodejs.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 <sspeiche@gmail.com>",
"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"
}
2 changes: 1 addition & 1 deletion views/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ <h2>How to use this example application</h2>

<h2>Deploying code changes</h2>
<p>
The source code for this application is available to be forked from the <a href="https://www.github.com/openshift/nodejs-ex">OpenShift GitHub repository</a>.
The source code for this application is available to be forked from the <a href="https://www.github.com/sclorg/nodejs-ex">OpenShift GitHub repository</a>.
You can configure a webhook in your repository to make OpenShift automatically start a build whenever you push your code:
</p>

Expand Down

0 comments on commit e79929f

Please sign in to comment.