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

Merge pull request #115 from hhorak/python-3.6

Browse source 
Django Example App Update to Python 3.6
This commit is contained in:
Honza Horak 2018-04-24 18:48:25 +02:00 committed by GitHub
commit 37f7fc4143
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
openshift/templates/django-postgresql-persistent.json
View file

@ -105,7 +105,7 @@
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "${NAMESPACE}", "namespace": "${NAMESPACE}",
"name": "python:3.5" "name": "python:${PYTHON_VERSION}"
}, },
"env": [ "env": [
{ {
@ -329,7 +329,7 @@
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "${NAMESPACE}", "namespace": "${NAMESPACE}",
"name": "postgresql:9.5" "name": "postgresql:${POSTGRESQL_VERSION}"
} }
} }
}, },
@ -437,6 +437,20 @@
"description": "The OpenShift Namespace where the ImageStream resides.", "description": "The OpenShift Namespace where the ImageStream resides.",
"value": "openshift" "value": "openshift"
}, },
{
"name": "PYTHON_VERSION",
"displayName": "Version of Python Image",
"description": "Version of Python image to be used (3.4, 3.5, 3.6 or latest).",
"value": "3.6",
"required": true
},
{
"name": "POSTGRESQL_VERSION",
"displayName": "Version of PostgreSQL Image",
"description": "Version of PostgreSQL image to be used (9.4, 9.5, 9.6 or latest).",
"value": "9.6",
"required": true
},
{ {
"name": "MEMORY_LIMIT", "name": "MEMORY_LIMIT",
"displayName": "Memory Limit", "displayName": "Memory Limit",

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

@ -105,7 +105,7 @@
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "${NAMESPACE}", "namespace": "${NAMESPACE}",
"name": "python:3.5" "name": "python:${PYTHON_VERSION}"
}, },
"env": [ "env": [
{ {
@ -312,7 +312,7 @@
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "${NAMESPACE}", "namespace": "${NAMESPACE}",
"name": "postgresql:9.5" "name": "postgresql:${POSTGRESQL_VERSION}"
} }
} }
}, },
@ -418,6 +418,20 @@
"description": "The OpenShift Namespace where the ImageStream resides.", "description": "The OpenShift Namespace where the ImageStream resides.",
"value": "openshift" "value": "openshift"
}, },
{
"name": "PYTHON_VERSION",
"displayName": "Version of Python Image",
"description": "Version of Python image to be used (3.4, 3.5, 3.6 or latest).",
"value": "3.6",
"required": true
},
{
"name": "POSTGRESQL_VERSION",
"displayName": "Version of PostgreSQL Image",
"description": "Version of PostgreSQL image to be used (9.4, 9.5, 9.6 or latest).",
"value": "9.6",
"required": true
},
{ {
"name": "MEMORY_LIMIT", "name": "MEMORY_LIMIT",
"displayName": "Memory Limit", "displayName": "Memory Limit",

9
openshift/templates/django.json
View file

@ -102,7 +102,7 @@
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "${NAMESPACE}", "namespace": "${NAMESPACE}",
"name": "python:3.5" "name": "python:${PYTHON_VERSION}"
}, },
"env": [ "env": [
{ {
@ -248,6 +248,13 @@
"description": "The OpenShift Namespace where the ImageStream resides.", "description": "The OpenShift Namespace where the ImageStream resides.",
"value": "openshift" "value": "openshift"
}, },
{
"name": "PYTHON_VERSION",
"displayName": "Version of Python Image",
"description": "Version of Python image to be used (3.4, 3.5, 3.6 or latest).",
"value": "3.6",
"required": true
},
{ {
"name": "MEMORY_LIMIT", "name": "MEMORY_LIMIT",
"displayName": "Memory Limit", "displayName": "Memory Limit",