summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-06-04 14:09:28 -0400
committerChris Evich <cevich@redhat.com>2019-06-10 12:54:42 -0400
commit1a9accb37973c1d025bd70d0803393a9866cc6f9 (patch)
tree878355ec1d2607aa08e88d6da2dc3b25e88c9707
parent901ac2cdd34d24aa5e33b0a0899e273052307b1b (diff)
downloadpodman-1a9accb37973c1d025bd70d0803393a9866cc6f9.tar.gz
podman-1a9accb37973c1d025bd70d0803393a9866cc6f9.tar.bz2
podman-1a9accb37973c1d025bd70d0803393a9866cc6f9.zip
Remove source-built buildah from CI
Signed-off-by: Chris Evich <cevich@redhat.com>
-rw-r--r--Dockerfile8
-rw-r--r--Dockerfile.centos8
-rw-r--r--Dockerfile.fedora8
-rw-r--r--contrib/cirrus/packer/fedora_setup.sh2
-rw-r--r--contrib/cirrus/packer/ubuntu_setup.sh2
-rw-r--r--contrib/gate/Dockerfile1
6 files changed, 0 insertions, 29 deletions
diff --git a/Dockerfile b/Dockerfile
index 4fc85e959..d729c00dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -79,14 +79,6 @@ RUN set -x \
&& cp bin/* /usr/libexec/cni \
&& 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
RUN set -x \
&& export GOPATH=/go \
diff --git a/Dockerfile.centos b/Dockerfile.centos
index 159449c63..c1d93d5d3 100644
--- a/Dockerfile.centos
+++ b/Dockerfile.centos
@@ -38,14 +38,6 @@ RUN set -x \
&& cp bin/* /usr/libexec/cni \
&& 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
RUN set -x \
&& export GOPATH=/go \
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index 74a770a90..d7c2d07e1 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -42,14 +42,6 @@ RUN set -x \
&& cp bin/* /usr/libexec/cni \
&& 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
RUN set -x \
&& export GOPATH=/go \
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh
index 33e240895..4388dc992 100644
--- a/contrib/cirrus/packer/fedora_setup.sh
+++ b/contrib/cirrus/packer/fedora_setup.sh
@@ -76,8 +76,6 @@ install_conmon
CNI_COMMIT=$FEDORA_CNI_COMMIT
install_cni_plugins
-install_buildah
-
sudo /tmp/libpod/hack/install_catatonit.sh
rh_finalize # N/B: Halts system!
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index 17e274d97..f183932c1 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -99,8 +99,6 @@ install_conmon
install_cni_plugins
-install_buildah
-
sudo /tmp/libpod/hack/install_catatonit.sh
install_varlink
diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile
index 9a6f5dc8d..630371c76 100644
--- a/contrib/gate/Dockerfile
+++ b/contrib/gate/Dockerfile
@@ -2,7 +2,6 @@ FROM fedora:29
RUN dnf -y install \
atomic-registries \
btrfs-progs-devel \
- buildah \
bzip2 \
conmon \
container-selinux \