Merge pull request #208 from gabemontero/nalins-seccomp-45

Force use of runc, since we know we're privileged, and customize our seccomp filter

Dockerfile

@@ -6,7 +6,7 @@ RUN hack/build.sh
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
 # TODO: Add fuse-overlayfs once we build off of RHEL-8 UBI
 RUN INSTALL_PKGS=" \
-      bind-utils bsdtar findutils git hostname lsof socat \
+      bind-utils bsdtar findutils git hostname lsof runc socat \
       sysvinit-tools tar tree util-linux wget which \
       " && \
     yum install -y --setopt=skip_missing_names_on_install=False $INSTALL_PKGS && \
@@ -15,6 +15,7 @@ COPY --from=builder /go/src/github.com/openshift/builder/openshift-builder /usr/
 COPY imagecontent/policy.json /etc/containers/
 COPY imagecontent/registries.conf /etc/containers/
 COPY imagecontent/storage.conf /etc/containers/
+COPY imagecontent/usr/share/containers /usr/share/containers
 RUN mkdir -p /var/cache/blobs \
     /var/lib/shared/overlay-images \
     /var/lib/shared/overlay-layers && \

Dockerfile-dev

@@ -5,14 +5,15 @@ LABEL io.k8s.display-name="OpenShift Origin Builder" \
 
 # TODO: Add fuse-overlayfs once we build off of RHEL-8 UBI
 RUN INSTALL_PKGS=" \
-      bind-utils bsdtar findutils git hostname lsof socat \
+      bind-utils bsdtar findutils git hostname lsof runc socat \
       sysvinit-tools tar tree util-linux wget which \
       " && \
     yum install -y --setopt=skip_missing_names_on_install=False ${INSTALL_PKGS} && \
     yum clean all
 
 COPY imagecontent/policy.json /etc/containers/
 COPY imagecontent/registries.conf /etc/containers/
+COPY imagecontent/usr/share/containers /usr/share/containers
 COPY imagecontent/storage.conf /etc/containers/
 RUN mkdir -p /var/cache/blobs \
     /var/lib/shared/overlay-images \

Dockerfile.rhel7

@@ -6,7 +6,7 @@ RUN hack/build.sh
 FROM registry.svc.ci.openshift.org/ocp/4.0:base
 # TODO: Add fuse-overlayfs once we build off of RHEL-8 UBI
 RUN INSTALL_PKGS=" \
-      bind-utils bsdtar findutils git hostname lsof socat \
+      bind-utils bsdtar findutils git hostname lsof runc socat \
       sysvinit-tools tar tree util-linux wget which \
       " && \
     yum install -y --setopt=skip_missing_names_on_install=False $INSTALL_PKGS && \
@@ -15,6 +15,7 @@ COPY --from=builder /go/src/github.com/openshift/builder/openshift-builder /usr/
 COPY imagecontent/policy.json /etc/containers/
 COPY imagecontent/registries.conf /etc/containers/
 COPY imagecontent/storage.conf /etc/containers/
+COPY imagecontent/usr/share/containers /usr/share/containers
 RUN mkdir -p /var/cache/blobs \
     /var/lib/shared/overlay-images \
     /var/lib/shared/overlay-layers && \