From 9b77fd9450122a661c232b6c850c3d1ab4568db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Mon, 10 May 2021 12:16:27 +0200 Subject: [PATCH] Rebase FASJSON OS image on F34 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- roles/openshift-apps/fasjson/templates/Dockerfile | 2 +- roles/openshift-apps/fasjson/templates/buildconfig.yml | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/roles/openshift-apps/fasjson/templates/Dockerfile b/roles/openshift-apps/fasjson/templates/Dockerfile index 423db387a5..99f1fa25f1 100644 --- a/roles/openshift-apps/fasjson/templates/Dockerfile +++ b/roles/openshift-apps/fasjson/templates/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:32 +FROM fedora:34 LABEL \ name="fasjson" \ vendor="Fedora Infrastructure" \ diff --git a/roles/openshift-apps/fasjson/templates/buildconfig.yml b/roles/openshift-apps/fasjson/templates/buildconfig.yml index 0d494b00bd..49fbb86104 100644 --- a/roles/openshift-apps/fasjson/templates/buildconfig.yml +++ b/roles/openshift-apps/fasjson/templates/buildconfig.yml @@ -24,11 +24,13 @@ spec: triggers: - type: ConfigChange - type: ImageChange - - type: GitHub {% if fasjson_stg_github_secret is defined and env == 'staging' %} + - type: GitHub github: secret: "{{ fasjson_stg_github_secret }}" {% elif fasjson_github_secret is defined and env == 'production' %} - github: - secret: "{{ fasjson_github_secret }}" + # Do we really want auto rebuilds in prod? + # - type: GitHub + # github: + # secret: "{{ fasjson_github_secret }}" {% endif %}