diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-12-17 15:55:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-17 15:55:03 -0500 |
| commit | 68414c5ee3066538903d04d55f135202ca4d333f (patch) | |
| tree | c97bdebfae66d508a37afd1854ec5caef094050d | |
| parent | c588c31cdb9ac5e2dcdded92603ed63ca19f674a (diff) | |
| parent | 401fb2bf2fa1a1bb4f82d1782bd9eba3dc7f171b (diff) | |
| download | podman-68414c5ee3066538903d04d55f135202ca4d333f.tar.gz podman-68414c5ee3066538903d04d55f135202ca4d333f.tar.bz2 podman-68414c5ee3066538903d04d55f135202ca4d333f.zip | |
Merge pull request #2010 from cevich/cirrus_editors
Cirrus: Add text editors to cache-images
| -rw-r--r-- | contrib/cirrus/packer/centos_setup.sh | 2 | ||||
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 2 | ||||
| -rw-r--r-- | contrib/cirrus/packer/rhel_setup.sh | 2 | ||||
| -rw-r--r-- | contrib/cirrus/packer/ubuntu_setup.sh | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/contrib/cirrus/packer/centos_setup.sh b/contrib/cirrus/packer/centos_setup.sh index 7b2308739..a13050569 100644 --- a/contrib/cirrus/packer/centos_setup.sh +++ b/contrib/cirrus/packer/centos_setup.sh @@ -29,6 +29,7 @@ ooe.sh sudo yum -y install \ btrfs-progs-devel \ bzip2 \ device-mapper-devel \ + emacs-nox \ findutils \ glib2-devel \ glibc-static \ @@ -63,6 +64,7 @@ ooe.sh sudo yum -y install \ runc \ skopeo-containers \ unzip \ + vim \ which \ xz diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index a14e1b01f..01c468901 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -29,6 +29,7 @@ ooe.sh sudo dnf install -y \ btrfs-progs-devel \ bzip2 \ device-mapper-devel \ + emacs-nox \ findutils \ git \ glib2-devel \ @@ -66,6 +67,7 @@ ooe.sh sudo dnf install -y \ skopeo-containers \ slirp4netns \ unzip \ + vim \ which \ xz diff --git a/contrib/cirrus/packer/rhel_setup.sh b/contrib/cirrus/packer/rhel_setup.sh index 7f0d4e589..99376fd65 100644 --- a/contrib/cirrus/packer/rhel_setup.sh +++ b/contrib/cirrus/packer/rhel_setup.sh @@ -35,6 +35,7 @@ ooe.sh sudo yum -y install \ btrfs-progs-devel \ bzip2 \ device-mapper-devel \ + emacs-nox \ findutils \ glib2-devel \ glibc-static \ @@ -69,6 +70,7 @@ ooe.sh sudo yum -y install \ runc \ skopeo-containers \ unzip \ + vim \ which \ xz diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh index 6e3613462..af5671c90 100644 --- a/contrib/cirrus/packer/ubuntu_setup.sh +++ b/contrib/cirrus/packer/ubuntu_setup.sh @@ -37,6 +37,7 @@ ooe.sh sudo -E apt-get -qq install --no-install-recommends \ build-essential \ curl \ e2fslibs-dev \ + emacs-nox \ gawk \ gettext \ go-md2man \ @@ -76,6 +77,7 @@ ooe.sh sudo -E apt-get -qq install --no-install-recommends \ python3-setuptools \ socat \ unzip \ + vim \ xz-utils echo "Fixing Ubuntu kernel not enabling swap accounting by default" |