From 4e6247c9f36bf1918a8b07c5836708e57e7171f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Tue, 22 Nov 2022 09:36:30 +0100 Subject: [PATCH] FMN: build the sendria image to workaround a bug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- .../openshift-apps/fmn/files/imagestream.yml | 14 +++++----- .../fmn/templates/Dockerfile-sendria | 5 ++++ .../fmn/templates/buildconfig.yml | 26 +++++++++++++++++++ 3 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 roles/openshift-apps/fmn/templates/Dockerfile-sendria diff --git a/roles/openshift-apps/fmn/files/imagestream.yml b/roles/openshift-apps/fmn/files/imagestream.yml index acfc5d415a..34510f0710 100644 --- a/roles/openshift-apps/fmn/files/imagestream.yml +++ b/roles/openshift-apps/fmn/files/imagestream.yml @@ -25,9 +25,11 @@ items: kind: ImageStream metadata: name: sendria - spec: - tags: - - name: latest - from: - kind: DockerImage - name: msztolcman/sendria:v2.2.2.0 + # We need to build the sendria image until this is fixed: + # https://github.com/msztolcman/sendria/issues/17 + # spec: + # tags: + # - name: latest + # from: + # kind: DockerImage + # name: msztolcman/sendria:v2.2.2.0 diff --git a/roles/openshift-apps/fmn/templates/Dockerfile-sendria b/roles/openshift-apps/fmn/templates/Dockerfile-sendria new file mode 100644 index 0000000000..a10d28f1a7 --- /dev/null +++ b/roles/openshift-apps/fmn/templates/Dockerfile-sendria @@ -0,0 +1,5 @@ +# Required until this is fixed: +# https://github.com/msztolcman/sendria/issues/17 + +FROM msztolcman/sendria:v2.2.2.0 +RUN chmod 0755 .local diff --git a/roles/openshift-apps/fmn/templates/buildconfig.yml b/roles/openshift-apps/fmn/templates/buildconfig.yml index db713885b4..ee434ba150 100644 --- a/roles/openshift-apps/fmn/templates/buildconfig.yml +++ b/roles/openshift-apps/fmn/templates/buildconfig.yml @@ -1,3 +1,4 @@ +--- apiVersion: build.openshift.io/v1 kind: BuildConfig metadata: @@ -41,3 +42,28 @@ spec: secretReference: name: fmn-github-webook {% endif %} +--- +# We need to build the sendria image until this is fixed: +# https://github.com/msztolcman/sendria/issues/17 +apiVersion: build.openshift.io/v1 +kind: BuildConfig +metadata: + name: sendria + labels: + app: fmn + build: sendria +spec: + runPolicy: Serial + source: + type: Dockerfile + dockerfile: |- + {{ load_file('Dockerfile-sendria') | indent(6) }} + strategy: + type: Docker + output: + to: + kind: ImageStreamTag + name: sendria:latest + triggers: + - type: ConfigChange + - type: ImageChange