Layer a deployment image ontop of the waiverdb candidate-registry image.
This commit is contained in:
parent
46a505414b
commit
c6cea79a7c
2 changed files with 33 additions and 3 deletions
30
roles/openshift-apps/waiverdb/files/buildconfig.yml
Normal file
30
roles/openshift-apps/waiverdb/files/buildconfig.yml
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
apiVersion: v1
|
||||||
|
kind: BuildConfig
|
||||||
|
metadata:
|
||||||
|
name: "waiverdb-docker-build"
|
||||||
|
labels:
|
||||||
|
environment: "waiverdb"
|
||||||
|
spec:
|
||||||
|
runPolicy: Serial
|
||||||
|
# This docker build exists only to layer some links ontop of the base waiverdb
|
||||||
|
# image from candidate-registry.fedoraproject.org
|
||||||
|
source:
|
||||||
|
dockerfile: |-
|
||||||
|
FROM waiverdb:latest
|
||||||
|
USER 0
|
||||||
|
RUN dnf -y install --setopt=tsflags=nodocs fedmsg && dnf -y clean all
|
||||||
|
# create a symlink for configuring fedmsg.
|
||||||
|
RUN ln -sfn /etc/fedmsg-waiverdb.d/waiverdb.py /etc/fedmsg.d/zz_waiverdb.py
|
||||||
|
# And another two for putting the certs in place.
|
||||||
|
RUN mkdir -p /etc/pki/fedmsg/
|
||||||
|
RUN ln -sf /etc/pki/fedmsg/key/fedmsg-waiverdb.key /etc/pki/fedmsg/waiverdb.key
|
||||||
|
RUN ln -sf /etc/pki/fedmsg/crt/fedmsg-waiverdb.crt /etc/pki/fedmsg/waiverdb.crt
|
||||||
|
# Make sure fedmsg can write its CRL.
|
||||||
|
RUN chmod 777 /var/run/fedmsg/
|
||||||
|
USER 1001
|
||||||
|
strategy:
|
||||||
|
type: Docker
|
||||||
|
output:
|
||||||
|
to:
|
||||||
|
kind: ImageStreamTag
|
||||||
|
name: waiverdb-deployment:latest
|
|
@ -19,7 +19,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: web
|
- name: web
|
||||||
image: waiverdb
|
image: waiverdb-deployment
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8080
|
- containerPort: 8080
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
@ -27,7 +27,7 @@ spec:
|
||||||
mountPath: /etc/waiverdb
|
mountPath: /etc/waiverdb
|
||||||
readOnly: true
|
readOnly: true
|
||||||
- name: fedmsg-config-volume
|
- name: fedmsg-config-volume
|
||||||
mountPath: /etc/fedmsg.d
|
mountPath: /etc/fedmsg-waiverdb.d
|
||||||
readOnly: true
|
readOnly: true
|
||||||
- name: secret-volume
|
- name: secret-volume
|
||||||
mountPath: /etc/secret
|
mountPath: /etc/secret
|
||||||
|
@ -88,5 +88,5 @@ spec:
|
||||||
- web
|
- web
|
||||||
from:
|
from:
|
||||||
kind: ImageStreamTag
|
kind: ImageStreamTag
|
||||||
name: waiverdb:latest
|
name: waiverdb-deployment:latest
|
||||||
- type: ConfigChange
|
- type: ConfigChange
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue