Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dotnet-pgsql-persistent template #27

Merged
merged 23 commits into from
Mar 9, 2017
Merged

Add dotnet-pgsql-persistent template #27

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
25fab88
Add dotnet-pgsql-persistent template
tmds Dec 22, 2016
cc3ebf5
Replace https by http in ASPNETCORE_URLS
tmds Jan 17, 2017
6f64e18
Add DOTNET_STARTUP_PROJECT to BuildConfig env
tmds Jan 28, 2017
4123a24
Add DOTNET_RESTORE_ROOT template parameter
tmds Jan 30, 2017
7a162ee
Remove ASPNETCORE_URLS (set by s2i-dotnetcore)
tmds Feb 6, 2017
beb85c6
DOTNET_STARTUP_PROJECT is only used in Build, remove from Deployment
tmds Feb 6, 2017
0b67f51
Use samples/MusicStore as context-root
tmds Feb 6, 2017
10f4cc8
Remove namespace (PR feedback)
tmds Feb 6, 2017
b832baa
Remove DOTNET_RESTORE_ROOT (cfr https://github.com/redhat-developer/s…
tmds Feb 9, 2017
a335f75
Add NAMESPACE parameter back
tmds Feb 14, 2017
b090909
Add livenessProbe and readinessProbe to dotnet container
tmds Feb 21, 2017
14033af
Default NAME parameter to musicstore
tmds Feb 21, 2017
1193f66
Merge branch 'master' into feature/template
tmds Mar 9, 2017
771224b
Adjust for 1.1.1-example branch
tmds Mar 9, 2017
d975498
Add all s2i-dotnetcore build envvars
tmds Mar 9, 2017
d309942
Merge remote-tracking branch 'upstream/master' into feature/template
tmds Mar 9, 2017
a8c7c81
Merge branch 'feature/template' of github.com:tmds/s2i-dotnetcore int…
tmds Mar 9, 2017
8805f00
Update README
tmds Mar 9, 2017
9f5acfc
Update git ref
tmds Mar 9, 2017
4872273
Add template usage instructions
tmds Mar 9, 2017
bc1658d
PR feedback
tmds Mar 9, 2017
0f9d807
Add annotations
tmds Mar 9, 2017
21bb483
rel/1.1.1-example -> rel/1.1-example
tmds Mar 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,34 @@ Example: `dotnet/dotnetcore-10-rhel7`
OpenShift Templates
-------------------

The `templates` folder contains OpenShift templates. Some of these will be shipped with OpenShift. If a template is not on your OpenShift installation, you can import it:
The `templates` folder contains OpenShift templates. Some of these will be shipped with OpenShift.
If a template is not on your OpenShift installation, you can import it:

```
oc create -f <template.json>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This only describes how to import the template itself. It would be useful to describe how a user would be able to instantiate it. Something like:

oc process dotnet-pgsql-persistent | oc create -f -

Once the above has been performed, what is the user expected to get? Would they be able to access the musicstore app directly? How would they be able to access it. I suppose this should go to https://github.com/redhat-developer/s2i-aspnet-musicstore-ex#openshift-web-console (i.e. into the readme there). If we add it there, we should put some references to the s2i-aspnet-musicstore-ex repo.

```

To instantiate a template you can use the `oc new-app` command:

```
oc new-app --template=<template>
```

In case you imported the template in your project, set the `NAMESPACE` parameter to your project name
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if that's correct. NAMESPACE needs to be specified when the dotnet imagestreams are not in openshift, but in a local project.

Suggested wording:

In case you've imported the .NET Core imagestreams into your local project, NAMESPACE needs to be specified to match it. This can be done by setting the NAMESPACE parameter via -p NAMESPACE=<project>.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. I will remove the paragraph since the README isn't describing how to import image streams.

by adding the `-p NAMESPACE=<project>` parameter.

The template can also be instantiated using the OpenShift web console. Login to the console and
navigate to the desired project. Click the **Add to Project** button. Search and select the \<template>.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure whether \<template> is very clear. How about this instead?

"Search and select the desired template by it's name, for example dotnet-example."

Next, click **Create** to start a build and deploy the sample application. Once the build has and deployment
have completed, you can browse to the application using the url you find in project overview.

**dotnet-example**

The dotnet-example template can be used to create a new .NET Core service in OpenShift. It provides parameters for all the environment
variables of the s2i-dotnetcore builder. It also includes a liveness and a readiness probe.

**dotnet-pgsql-persistent**

The dotnet-pgsql-persistent creates a .NET Core service with a PostgreSQL backend. It provides parameters for all the environment
variables of the s2i-dotnetcore builder and variables to setup the database. The database connection information is passed to the
.NET application via the `ConnectionString` environment variable.
Loading