Browse Source

Merge pull request #26 from bparees/version

update image version
pull/28/head
Ben Parees 10 years ago
parent
commit
2b30d21957
2 changed files with 22 additions and 8 deletions
  1. +18
    -7
      openshift/templates/django-postgresql.json
  2. +4
    -1
      openshift/templates/django.json

+ 18
- 7
openshift/templates/django-postgresql.json View File

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


+ 4
- 1
openshift/templates/django.json View File

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


Loading…
Cancel
Save