From 8e44d68d3086fb251e4987855058e96b62280374 Mon Sep 17 00:00:00 2001 From: Ben Parees Date: Fri, 20 Nov 2015 18:26:32 -0500 Subject: [PATCH] update image version --- openshift/templates/django-postgresql.json | 25 ++++++++++++++++------ openshift/templates/django.json | 5 ++++- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/openshift/templates/django-postgresql.json b/openshift/templates/django-postgresql.json index 749064e..ff7fd32 100644 --- a/openshift/templates/django-postgresql.json +++ b/openshift/templates/django-postgresql.json @@ -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)" diff --git a/openshift/templates/django.json b/openshift/templates/django.json index 143a942..75b6798 100644 --- a/openshift/templates/django.json +++ b/openshift/templates/django.json @@ -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": {