opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 11:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3261 from cevich/no_buildah

Browse Source 
Remove source-built buildah from CI
This commit is contained in:
OpenShift Merge Robot
2019-06-11 21:40:30 +02:00
committed by GitHub
parent c385f33cdf 8baa897356
commit f8a84fdcff
7 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.cirrus.yml
View File

@ -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

8
Dockerfile
View File

@ -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 \

8
Dockerfile.centos
View File

@ -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 \

8
Dockerfile.fedora
View File

@ -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 \

2
contrib/cirrus/packer/fedora_setup.sh
View File

@ -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!

2
contrib/cirrus/packer/ubuntu_setup.sh
View File

@ -99,8 +99,6 @@ install_conmon
install_cni_plugins
install_buildah
sudo /tmp/libpod/hack/install_catatonit.sh
install_varlink

1
contrib/gate/Dockerfile
View File

@ -2,7 +2,6 @@ FROM fedora:29
RUN dnf -y install \
atomic-registries \
btrfs-progs-devel \
buildah \
bzip2 \
conmon \
container-selinux \