Remove source-built buildah from CI
Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
parent
901ac2cdd3
commit
1a9accb379
|
|
@ -79,14 +79,6 @@ RUN set -x \
|
||||||
&& cp bin/* /usr/libexec/cni \
|
&& cp bin/* /usr/libexec/cni \
|
||||||
&& rm -rf "$GOPATH"
|
&& rm -rf "$GOPATH"
|
||||||
|
|
||||||
# Install buildah
|
|
||||||
RUN set -x \
|
|
||||||
&& export GOPATH=/go \
|
|
||||||
&& git clone https://github.com/containers/buildah "$GOPATH/src/github.com/containers/buildah" \
|
|
||||||
&& cd "$GOPATH/src/github.com/containers/buildah" \
|
|
||||||
&& make \
|
|
||||||
&& make install
|
|
||||||
|
|
||||||
# Install ginkgo
|
# Install ginkgo
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& export GOPATH=/go \
|
&& export GOPATH=/go \
|
||||||
|
|
|
||||||
|
|
@ -38,14 +38,6 @@ RUN set -x \
|
||||||
&& cp bin/* /usr/libexec/cni \
|
&& cp bin/* /usr/libexec/cni \
|
||||||
&& rm -rf "$GOPATH"
|
&& rm -rf "$GOPATH"
|
||||||
|
|
||||||
# Install buildah
|
|
||||||
RUN set -x \
|
|
||||||
&& export GOPATH=/go \
|
|
||||||
&& git clone https://github.com/containers/buildah "$GOPATH/src/github.com/containers/buildah" \
|
|
||||||
&& cd "$GOPATH/src/github.com/containers/buildah" \
|
|
||||||
&& make \
|
|
||||||
&& make install
|
|
||||||
|
|
||||||
# Install ginkgo
|
# Install ginkgo
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& export GOPATH=/go \
|
&& export GOPATH=/go \
|
||||||
|
|
|
||||||
|
|
@ -42,14 +42,6 @@ RUN set -x \
|
||||||
&& cp bin/* /usr/libexec/cni \
|
&& cp bin/* /usr/libexec/cni \
|
||||||
&& rm -rf "$GOPATH"
|
&& rm -rf "$GOPATH"
|
||||||
|
|
||||||
# Install buildah
|
|
||||||
RUN set -x \
|
|
||||||
&& export GOPATH=/go \
|
|
||||||
&& git clone https://github.com/containers/buildah "$GOPATH/src/github.com/containers/buildah" \
|
|
||||||
&& cd "$GOPATH/src/github.com/containers/buildah" \
|
|
||||||
&& make \
|
|
||||||
&& make install
|
|
||||||
|
|
||||||
# Install ginkgo
|
# Install ginkgo
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& export GOPATH=/go \
|
&& export GOPATH=/go \
|
||||||
|
|
|
||||||
|
|
@ -76,8 +76,6 @@ install_conmon
|
||||||
CNI_COMMIT=$FEDORA_CNI_COMMIT
|
CNI_COMMIT=$FEDORA_CNI_COMMIT
|
||||||
install_cni_plugins
|
install_cni_plugins
|
||||||
|
|
||||||
install_buildah
|
|
||||||
|
|
||||||
sudo /tmp/libpod/hack/install_catatonit.sh
|
sudo /tmp/libpod/hack/install_catatonit.sh
|
||||||
|
|
||||||
rh_finalize # N/B: Halts system!
|
rh_finalize # N/B: Halts system!
|
||||||
|
|
|
||||||
|
|
@ -99,8 +99,6 @@ install_conmon
|
||||||
|
|
||||||
install_cni_plugins
|
install_cni_plugins
|
||||||
|
|
||||||
install_buildah
|
|
||||||
|
|
||||||
sudo /tmp/libpod/hack/install_catatonit.sh
|
sudo /tmp/libpod/hack/install_catatonit.sh
|
||||||
|
|
||||||
install_varlink
|
install_varlink
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@ FROM fedora:29
|
||||||
RUN dnf -y install \
|
RUN dnf -y install \
|
||||||
atomic-registries \
|
atomic-registries \
|
||||||
btrfs-progs-devel \
|
btrfs-progs-devel \
|
||||||
buildah \
|
|
||||||
bzip2 \
|
bzip2 \
|
||||||
conmon \
|
conmon \
|
||||||
container-selinux \
|
container-selinux \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue