Skip to content

Commit 1a77d83

Browse files
Merge pull request #44 from smarterclayton/workaround_bug
Workaround bug 1677818 in microdnf for new UBI base images
2 parents 55a2ff8 + 0b53e3f commit 1a77d83

File tree

3 files changed

+0
-3
lines changed

3 files changed

+0
-3
lines changed

Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ RUN INSTALL_PKGS=" \
1010
git tar bsdtar \
1111
" && \
1212
yum install -y $INSTALL_PKGS && \
13-
rpm -V $INSTALL_PKGS && \
1413
yum clean all
1514
COPY --from=builder /go/src/github.com/openshift/builder/openshift-builder /usr/bin/
1615
COPY imagecontent/policy.json /etc/containers/

Dockerfile-dev

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN INSTALL_PKGS=" \
99
git tar bsdtar \
1010
" && \
1111
yum install -y ${INSTALL_PKGS} && \
12-
rpm -V ${INSTALL_PKGS} && \
1312
yum clean all
1413

1514
COPY imagecontent/policy.json /etc/containers/

Dockerfile.rhel7

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ RUN INSTALL_PKGS=" \
1010
git tar bsdtar \
1111
" && \
1212
yum install -y $INSTALL_PKGS && \
13-
rpm -V $INSTALL_PKGS && \
1413
yum clean all
1514
COPY --from=builder /go/src/github.com/openshift/builder/openshift-builder /usr/bin/
1615
COPY imagecontent/policy.json /etc/containers/

0 commit comments

Comments
 (0)