Commit 5bca1cfa authored by Alexander Pace's avatar Alexander Pace

rebuilding docker image with patched gstlal-inspiral to disable servicediscovery

parent 08c1b8fc
Pipeline #84183 passed with stages
in 68 minutes and 7 seconds
...@@ -6,7 +6,7 @@ FROM containers.ligo.org/alexander.pace/gstlal-dev/gstlal-dev:el7 ...@@ -6,7 +6,7 @@ FROM containers.ligo.org/alexander.pace/gstlal-dev/gstlal-dev:el7
# Labeling/packaging stuff: # Labeling/packaging stuff:
LABEL name="GstLAL Runtime Package, EL7" \ LABEL name="GstLAL Runtime Package, EL7" \
maintainer="Alexander Pace <alexander.pace@ligo.org>" \ maintainer="Alexander Pace <alexander.pace@ligo.org>" \
date="2019-09-19" \ date="2019-10-16" \
support="Reference Platform, EL7" support="Reference Platform, EL7"
USER root USER root
...@@ -18,6 +18,8 @@ COPY rpms /rpms ...@@ -18,6 +18,8 @@ COPY rpms /rpms
RUN yum makecache && \ RUN yum makecache && \
yum -y localinstall /rpms/*.rpm yum -y localinstall /rpms/*.rpm
# Patch /usr/bin/gstlal-inspiral to disable servicediscovery
RUN patch /usr/bin/gstlal_inspiral /rpms/disable_service_discovery.patch
# Update gstreamer registry cache: # Update gstreamer registry cache:
ENV GST_REGISTRY_1_0=/usr/share/gstreamer-1.0/.registry.bin ENV GST_REGISTRY_1_0=/usr/share/gstreamer-1.0/.registry.bin
...@@ -28,8 +30,6 @@ RUN gst-inspect-1.0 ...@@ -28,8 +30,6 @@ RUN gst-inspect-1.0
#RUN rm -rf /rpms && \ #RUN rm -rf /rpms && \
RUN yum clean all RUN yum clean all
# Export MKL environment variables: # Export MKL environment variables:
ENV MKL_INTERFACE_LAYER LP64 ENV MKL_INTERFACE_LAYER LP64
......
...@@ -413,9 +413,20 @@ docker:el7: ...@@ -413,9 +413,20 @@ docker:el7:
script: script:
# add RPMs to directory to pass to docker # add RPMs to directory to pass to docker
- mkdir rpms - mkdir rpms
# Copy over patch that will be used to disable servicediscovery.
# In the dockerfile, first install the rpms, and then apply the
# patch to /usr/bin/gstlal-inspiral. Just put it in the same
# directory as where the rpms are going to get copied.
- cp gstlal-inspiral/tests/disable_service_discovery.patch rpms/
# Copy rpms to new container.
- mv rpmbuild/RPMS/x86_64/*.rpm rpms - mv rpmbuild/RPMS/x86_64/*.rpm rpms
# copy over spec file patching script
# Clear out the old rpmbuild directory
- rm -rf rpmbuild* - rm -rf rpmbuild*
# Build the container: # Build the container:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker build --pull -t $CI_REGISTRY_IMAGE/gstlal:el7 --file .gitlab-ci.Dockerfile.e7 . - docker build --pull -t $CI_REGISTRY_IMAGE/gstlal:el7 --file .gitlab-ci.Dockerfile.e7 .
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment