aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-11 21:40:30 +0200
committerGitHub <noreply@github.com>2019-06-11 21:40:30 +0200
commitf8a84fdcff12fdc150bb303d0004d5ba0cd6087b (patch)
tree5628def27288b40542087e444a824e100cd3ab80
parentc385f33cdf5e480b4c3f03227989cd56563d9cc0 (diff)
parent8baa897356d1c48044c8e38ac08ec89919082339 (diff)
downloadpodman-f8a84fdcff12fdc150bb303d0004d5ba0cd6087b.tar.gz
podman-f8a84fdcff12fdc150bb303d0004d5ba0cd6087b.tar.bz2
podman-f8a84fdcff12fdc150bb303d0004d5ba0cd6087b.zip
Merge pull request #3261 from cevich/no_buildah
Remove source-built buildah from CI
-rw-r--r--.cirrus.yml6
-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
7 files changed, 3 insertions, 32 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index cc645e601..4344b6b0a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -31,9 +31,9 @@ env:
####
#### Cache-image names to test with
###
- FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-5171433328607232"
- PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-5171433328607232"
- UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-5171433328607232"
+ FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-5157899144265728"
+ PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-5157899144265728"
+ UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-5157899144265728"
####
#### Variables for composing new cache-images (used in PR testing) from
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 \