Use only one image

roles/openshift-apps/release-monitoring/files/buildconfig.yml

@@ -10,7 +10,7 @@ items:
     runPolicy: Serial
     source:
       dockerfile: |-
-        FROM fedora:28
+        FROM fedora:29
         LABEL \
           name="release-monitoring-web" \
           vendor="Fedora Infrastructure" \
@@ -60,7 +60,6 @@ items:
         RUN mkdir -p /etc/pki/fedmsg/
         RUN ln -sf /etc/pki/fedmsg/key/fedmsg-release-monitoring.key /etc/pki/fedmsg/release-monitoring.key
         RUN ln -sf /etc/pki/fedmsg/crt/fedmsg-release-monitoring.crt /etc/pki/fedmsg/release-monitoring.crt
-        ENV USER=anitya
         EXPOSE 8080
         EXPOSE 9940
         ENTRYPOINT python3-gunicorn --bind 0.0.0.0:8080 --access-logfile=- anitya.wsgi:application
@@ -71,50 +70,5 @@ items:
       to:
         kind: ImageStreamTag
         name: release-monitoring-web:latest
-- apiVersion: v1
-  kind: BuildConfig
-  metadata:
-    labels:
-      build: fedmsg-hub-build
-    name: fedmsg-hub-build
-  spec:
-    runPolicy: Serial
-    source:
-      dockerfile: |-
-        FROM fedora:27
-        LABEL \
-          name="fedmsg-hub" \
-          vendor="Fedora Infrastructure" \
-          license="MIT"
-        RUN dnf install -y \
-                git \
-                python3-blinker \
-                python3-dateutil \
-                python3-fedmsg \
-                python3-flask \
-                python3-flask-wtf \
-                python3-flask-login \
-                python3-flask-restful \
-                python3-flask-openid \
-                python3-gunicorn \
-                python3-openid \
-                python3-pip \
-                python3-psycopg2 \
-                python3-setuptools \
-                python3-straight-plugin \
-                python3-sqlalchemy \
-                python3-wtforms && \
-            dnf autoremove -y && \
-            dnf clean all -y
-        RUN pip-3 install git+https://github.com/release-monitoring/anitya.git@master
-        ENV USER=fedmsg
-        ENTRYPOINT fedmsg-hub
-      type: Dockerfile
-    strategy:
-      type: Docker
-    output:
-      to:
-        kind: ImageStreamTag
-        name: fedmsg-hub:latest
 kind: List
 metadata: {}

roles/openshift-apps/release-monitoring/files/deploymentconfig.yml

@@ -40,6 +40,10 @@ items:
         containers:
         - name: release-monitoring-web
           image: release-monitoring/release-monitoring-web:latest
+          command: python3-gunicorn --bind 0.0.0.0:8080 --access-logfile=- anitya.wsgi:application
+          env:
+            - name: USER
+              value: anitya
           ports:
           - containerPort: 8080
           resources: {}
@@ -124,7 +128,11 @@ items:
       spec:
         containers:
         - name: fedmsg-hub
-          image: release-monitoring/fedmsg-hub:latest
+          image: release-monitoring/release-monitoring-web:latest
+          command: fedmsg-hub
+          env:
+            - name: USER
+              value: fedmsg
           resources: {}
           volumeMounts:
           - name: config-volume
@@ -141,7 +149,7 @@ items:
         - fedmsg-hub
         from:
           kind: ImageStreamTag
-          name: fedmsg-hub:latest
+          name: release-monitoring-web:latest
           namespace: release-monitoring
       type: ImageChange
     - type: ConfigChange