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

Add PIP_INDEX_URL option and fix required parameter issue

Browse source 
The new PIP_INDEX_URL parameter is added to allow custom PyPi mirror
URL to be used during the build process.

There are several paramaters that are required but didn't listed as
requested (*). Now, they are marked as required to be explicit.

Signed-off-by: Vu Dinh <vdinh@redhat.com>
This commit is contained in:
Vu Dinh 2016-07-06 11:51:46 -04:00
parent 70d28615a8
commit 472ea2f68f
2 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,13 @@
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "${NAMESPACE}", "namespace": "${NAMESPACE}",
"name": "python:3.4" "name": "python:3.4"
},
"env": [
{
"name": "PIP_INDEX_URL",
"value": "${PIP_INDEX_URL}"
} }
]
} }
}, },
"output": { "output": {
@ -359,24 +365,28 @@
{ {
"name": "NAMESPACE", "name": "NAMESPACE",
"displayName": "Namespace", "displayName": "Namespace",
"required": true,
"description": "The OpenShift Namespace where the ImageStream resides.", "description": "The OpenShift Namespace where the ImageStream resides.",
"value": "openshift" "value": "openshift"
}, },
{ {
"name": "MEMORY_LIMIT", "name": "MEMORY_LIMIT",
"displayName": "Memory Limit", "displayName": "Memory Limit",
"required": true,
"description": "Maximum amount of memory the Django container can use.", "description": "Maximum amount of memory the Django container can use.",
"value": "512Mi" "value": "512Mi"
}, },
{ {
"name": "MEMORY_POSTGRESQL_LIMIT", "name": "MEMORY_POSTGRESQL_LIMIT",
"displayName": "Memory Limit (PostgreSQL)", "displayName": "Memory Limit (PostgreSQL)",
"required": true,
"description": "Maximum amount of memory the PostgreSQL container can use.", "description": "Maximum amount of memory the PostgreSQL container can use.",
"value": "512Mi" "value": "512Mi"
}, },
{ {
"name": "SOURCE_REPOSITORY_URL", "name": "SOURCE_REPOSITORY_URL",
"displayName": "Git Repository URL", "displayName": "Git Repository URL",
"required": true,
"description": "The URL of the repository with your application source code.", "description": "The URL of the repository with your application source code.",
"value": "https://github.com/openshift/django-ex.git" "value": "https://github.com/openshift/django-ex.git"
}, },
@ -406,22 +416,26 @@
{ {
"name": "DATABASE_SERVICE_NAME", "name": "DATABASE_SERVICE_NAME",
"displayName": "Database Service Name", "displayName": "Database Service Name",
"required": true,
"value": "postgresql" "value": "postgresql"
}, },
{ {
"name": "DATABASE_ENGINE", "name": "DATABASE_ENGINE",
"displayName": "Database Engine", "displayName": "Database Engine",
"required": true,
"description": "Database engine: postgresql, mysql or sqlite (default).", "description": "Database engine: postgresql, mysql or sqlite (default).",
"value": "postgresql" "value": "postgresql"
}, },
{ {
"name": "DATABASE_NAME", "name": "DATABASE_NAME",
"displayName": "Database Name", "displayName": "Database Name",
"required": true,
"value": "default" "value": "default"
}, },
{ {
"name": "DATABASE_USER", "name": "DATABASE_USER",
"displayName": "Database Username", "displayName": "Database Username",
"required": true,
"value": "django" "value": "django"
}, },
{ {
@ -441,6 +455,12 @@
"description": "Set this to a long random string.", "description": "Set this to a long random string.",
"generate": "expression", "generate": "expression",
"from": "[\\w]{50}" "from": "[\\w]{50}"
},
{
"name": "PIP_INDEX_URL",
"displayName": "Custom PyPi Index URL",
"description": "The custom PyPi index URL",
"value": ""
} }
] ]
} }

15
openshift/templates/django.json
View file

@ -84,7 +84,13 @@
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "${NAMESPACE}", "namespace": "${NAMESPACE}",
"name": "python:3.4" "name": "python:3.4"
},
"env": [
{
"name": "PIP_INDEX_URL",
"value": "${PIP_INDEX_URL}"
} }
]
} }
}, },
"output": { "output": {
@ -233,18 +239,21 @@
{ {
"name": "NAMESPACE", "name": "NAMESPACE",
"displayName": "Namespace", "displayName": "Namespace",
"required": true,
"description": "The OpenShift Namespace where the ImageStream resides.", "description": "The OpenShift Namespace where the ImageStream resides.",
"value": "openshift" "value": "openshift"
}, },
{ {
"name": "MEMORY_LIMIT", "name": "MEMORY_LIMIT",
"displayName": "Memory Limit", "displayName": "Memory Limit",
"required": true,
"description": "Maximum amount of memory the container can use.", "description": "Maximum amount of memory the container can use.",
"value": "512Mi" "value": "512Mi"
}, },
{ {
"name": "SOURCE_REPOSITORY_URL", "name": "SOURCE_REPOSITORY_URL",
"displayName": "Git Repository URL", "displayName": "Git Repository URL",
"required": true,
"description": "The URL of the repository with your application source code.", "description": "The URL of the repository with your application source code.",
"value": "https://github.com/openshift/django-ex.git" "value": "https://github.com/openshift/django-ex.git"
}, },
@ -303,6 +312,12 @@
"description": "Set this to a long random string.", "description": "Set this to a long random string.",
"generate": "expression", "generate": "expression",
"from": "[\\w]{50}" "from": "[\\w]{50}"
},
{
"name": "PIP_INDEX_URL",
"displayName": "Custom PyPi Index URL",
"description": "The custom PyPi index URL",
"value": ""
} }
] ]
} }