diff --git a/roles/openshift-apps/badges/files/imagestream.yml b/roles/openshift-apps/badges/files/imagestream.yml index 2da36b52f6..c6a0606f67 100644 --- a/roles/openshift-apps/badges/files/imagestream.yml +++ b/roles/openshift-apps/badges/files/imagestream.yml @@ -27,3 +27,8 @@ items: scheduled: true referencePolicy: type: Source + # The Python 3.10 builder image plus custom packages + - apiVersion: image.openshift.io/v1 + kind: ImageStream + metadata: + name: python-310-custom-builder diff --git a/roles/openshift-apps/badges/templates/Dockerfile-builder-image b/roles/openshift-apps/badges/templates/Dockerfile-builder-image new file mode 100644 index 0000000000..1ff18aa2d4 --- /dev/null +++ b/roles/openshift-apps/badges/templates/Dockerfile-builder-image @@ -0,0 +1,8 @@ +FROM quay.io/fedora/python-310:latest +LABEL \ + name="python-310-badges-custom-builder" \ + vendor="Fedora Infrastructure" \ + license="MIT" +USER root +RUN dnf install -y cyrus-sasl-gssapi +USER 1001 diff --git a/roles/openshift-apps/badges/templates/buildconfig.yml b/roles/openshift-apps/badges/templates/buildconfig.yml index 0de13bca39..40f899886d 100644 --- a/roles/openshift-apps/badges/templates/buildconfig.yml +++ b/roles/openshift-apps/badges/templates/buildconfig.yml @@ -2,6 +2,32 @@ --- apiVersion: build.openshift.io/v1 kind: BuildConfig +metadata: + name: python-310-custom-builder + labels: + app: badges + build: python-310-custom-builder +spec: + runPolicy: Serial + source: + type: Dockerfile + dockerfile: |- + {{ load_file('Dockerfile-builder-image') | indent(6) }} + strategy: + type: Docker + dockerStrategy: + from: + kind: ImageStreamTag + name: python-310:latest + output: + to: + kind: ImageStreamTag + name: python-310-custom-builder:latest + triggers: + - type: ImageChange +--- +apiVersion: build.openshift.io/v1 +kind: BuildConfig metadata: name: fedbadges labels: @@ -21,7 +47,7 @@ spec: sourceStrategy: from: kind: ImageStreamTag - name: python-310:latest + name: python-310-custom-builder:latest output: to: kind: ImageStreamTag @@ -59,7 +85,7 @@ spec: sourceStrategy: from: kind: ImageStreamTag - name: python-310:latest + name: python-310-custom-builder:latest output: to: kind: ImageStreamTag