From 3cc689821490afa129b2b1acefbdcd7a62b259a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= Date: Mon, 27 May 2019 13:47:29 +0200 Subject: [PATCH] the-new-hotness: Add RPM_PACKAGER env variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will hopefully fix https://github.com/fedora-infra/the-new-hotness/issues/237 Signed-off-by: Michal Konečný --- .../release-monitoring/files/deploymentconfig.yml | 2 +- .../openshift-apps/the-new-hotness/files/deploymentconfig.yml | 3 +++ roles/openshift-apps/the-new-hotness/templates/buildconfig.yml | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml b/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml index 5118f58e88..188cdf8bf6 100644 --- a/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml +++ b/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml @@ -39,7 +39,7 @@ items: args: - /etc/anitya/start.sh env: - - name: ANITYA_WEB_CONFIG + - name: RPM_PACKAGER value: /etc/anitya/anitya.toml ports: - containerPort: 8080 diff --git a/roles/openshift-apps/the-new-hotness/files/deploymentconfig.yml b/roles/openshift-apps/the-new-hotness/files/deploymentconfig.yml index dd2583c8f3..a37db6afdd 100644 --- a/roles/openshift-apps/the-new-hotness/files/deploymentconfig.yml +++ b/roles/openshift-apps/the-new-hotness/files/deploymentconfig.yml @@ -37,6 +37,9 @@ items: - name: the-new-hotness image: the-new-hotness/the-new-hotness:latest command: ["fedora-messaging", "consume"] + env: + - name: RPM_PACKAGER + value: hotness volumeMounts: - name: config-volume mountPath: /etc/fedora-messaging diff --git a/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml b/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml index 408c4c6b94..173907171d 100644 --- a/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml +++ b/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml @@ -46,7 +46,6 @@ items: pushd hotness_schema && \ pip-3 install . && \ rm -rf the-new-hotness - USER 1001 EXPOSE 9940 type: Dockerfile git: