X-dark/django-ex
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #26 from bparees/version

Browse source 
update image version
This commit is contained in:
Ben Parees 2015-11-20 19:36:02 -05:00
commit 2b30d21957
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
openshift/templates/django-postgresql.json
View file

@ -83,7 +83,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "openshift",
"name": "python:3.3"
"name": "python:3.4"
}
}
},
@ -97,6 +97,9 @@
{
"type": "ImageChange"
},
{
"type": "ConfigChange"
},
{
"type": "GitHub",
"github": {
@ -230,6 +233,19 @@
"type": "Recreate"
},
"triggers": [
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": false,
"containerNames": [
"postgresql"
],
"from": {
"kind": "ImageStreamTag",
"name": "postgresql:9.4"
}
}
},
{
"type": "ConfigChange"
}
@ -249,7 +265,7 @@
"containers": [
{
"name": "postgresql",
"image": "${POSTGRESQL_IMAGE}",
"image": "postgresql",
"ports": [
{
"containerPort": 5432
@ -327,11 +343,6 @@
"generate": "expression",
"from": "[a-zA-Z0-9]{16}"
},
{
"name": "POSTGRESQL_IMAGE",
"description": "Image to use for postgresql",
"value": "openshift/postgresql-92-centos7"
},
{
"name": "APP_CONFIG",
"description": "Relative path to Gunicorn configuration file (optional)"

5
openshift/templates/django.json
View file

@ -83,7 +83,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "openshift",
"name": "python:3.3"
"name": "python:3.4"
}
}
},
@ -97,6 +97,9 @@
{
"type": "ImageChange"
},
{
"type": "ConfigChange"
},
{
"type": "GitHub",
"github": {