[extensions-web/deploy] openshift: properly specify container image
- From: Yuri Konotopov <ykonotopov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [extensions-web/deploy] openshift: properly specify container image
- Date: Sat, 15 Dec 2018 08:24:31 +0000 (UTC)
commit 27d104af512a0b5f0c97d34ca42231a87b72a630
Author: Yuri Konotopov <ykonotopov gnome org>
Date: Sat Dec 15 12:24:23 2018 +0400
openshift: properly specify container image
openshift/templates/extensions-web-nginx.json | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/openshift/templates/extensions-web-nginx.json b/openshift/templates/extensions-web-nginx.json
index 695f949..e83b1ff 100644
--- a/openshift/templates/extensions-web-nginx.json
+++ b/openshift/templates/extensions-web-nginx.json
@@ -311,7 +311,7 @@
"containers": [
{
"name": "${NAME}",
- "image": " ",
+ "image": "${DEFAULT_DOCKER_REGISTRY}/${NAME}/${NAME}:latest",
"command": [
"bash"
],
@@ -416,7 +416,7 @@
},
{
"name": "frontend",
- "image": " ",
+ "image": "${DEFAULT_DOCKER_REGISTRY}/${NAME}/frontend:latest",
"ports": [
{
"containerPort": 8080
@@ -473,7 +473,7 @@
"containers": [
{
"name": "update-popularity",
- "image": "${NAME}:latest",
+ "image": "${DEFAULT_DOCKER_REGISTRY}/${NAME}/${NAME}:latest",
"command": ["/extensions-web/app/bin/sweettooth-cron-update"],
"env": [
{
@@ -563,7 +563,7 @@
"containers": [
{
"name": "update-software",
- "image": "${NAME}:latest",
+ "image": "${DEFAULT_DOCKER_REGISTRY}/${NAME}/${NAME}:latest",
"command": ["/extensions-web/app/bin/sweettooth-cron-software"],
"env": [
{
@@ -706,6 +706,12 @@
"displayName": "WebHook secret key",
"description": "Secret key for GNOME Gitlab.",
"value": ""
+ },
+ {
+ "name": "DEFAULT_DOCKER_REGISTRY",
+ "displayName": "Docker registry.",
+ "description": "URL of private docker registry. Usually docker-registry.default.svc:5000",
+ "value": "docker-registry.default.svc:5000"
}
]
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]