Permalink
Browse files

test: Use prebuilt docker hub bash-completion images

Dockerfiles for these are maintained in separate repo,
scop/bash-completion-docker.
  • Loading branch information...
scop committed Sep 16, 2017
1 parent 334b47c commit ecaec9a86470c6d6299a6522c0fddde44ff0b5f6
Showing with 22 additions and 267 deletions.
  1. +2 −2 .travis.yml
  2. +6 −14 test/docker/Dockerfile-centos6
  3. +6 −37 test/docker/Dockerfile-fedoradev
  4. +8 −214 test/docker/Dockerfile-ubuntu14
View
@@ -11,7 +11,7 @@ env:
- DIST=ubuntu14
before_install:
- docker build -t bashcomp:$DIST -f test/docker/Dockerfile-$DIST .
- docker build -t bash-completion:$DIST -f test/docker/Dockerfile-$DIST .
script:
- docker run -e CI=true -e DIST=$DIST -t bashcomp:$DIST test/docker/docker-script.sh
- docker run -e CI=true -e DIST=$DIST -t bash-completion:$DIST test/docker/docker-script.sh
@@ -1,18 +1,10 @@
FROM centos:6
FROM vskytta/bash-completion:centos6
# TODO: more coverage
# /usr/bin/which: https://bugzilla.redhat.com/show_bug.cgi?id=1443357
RUN sed -i -e /tsflags=nodocs/d /etc/yum.conf \
&& \
yum -y install \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm \
&& \
yum -y install \
autoconf \
automake \
dejagnu \
tcllib \
/usr/bin/xvfb-run /usr/bin/which
# When adding new completions, install packages desired for their testing here
# in case they're not in the base image, and remove later when the base image
# has caught up.
#RUN yum -y install \
# some-package
WORKDIR /usr/src/bash-completion
COPY . .
@@ -1,41 +1,10 @@
FROM fedora:rawhide
FROM vskytta/bash-completion:fedoradev
# TODO: more coverage
# --nogpgcheck: Ignore transient(?) package signature failures
RUN dnf --nogpgcheck --refresh -y install \
autoconf \
automake \
dejagnu \
tcllib \
/usr/bin/xvfb-run \
&& \
dnf --nogpgcheck -y install \
/usr/bin/checksec \
/usr/bin/compare \
/usr/bin/dcop \
/usr/sbin/ether-wake \
/usr/bin/g77 \
/usr/sbin/hping2 \
/usr/bin/koji \
/usr/bin/lua \
/usr/bin/luac \
/usr/sbin/mii-diag \
/usr/bin/mock \
/usr/bin/msynctool \
/usr/bin/mutt \
/usr/bin/ncftp \
/usr/bin/phing \
/usr/bin/plague-client \
/usr/bin/pngfix \
/usr/bin/pyvenv \
/usr/bin/snownews \
/usr/bin/stream \
/usr/bin/svk \
/usr/sbin/tipc \
/usr/bin/wine \
/usr/bin/wol \
/usr/bin/xmms \
/usr/bin/zopflipng
# When adding new completions, install packages desired for their testing here
# in case they're not in the base image, and remove later when the base image
# has caught up.
#RUN dnf --nogpgcheck --refresh -y install \
# some-package
WORKDIR /usr/src/bash-completion
COPY . .
@@ -1,218 +1,12 @@
FROM ubuntu:14.04
FROM vskytta/bash-completion:ubuntu14
# dpkg --add-architecture i386 for wine
RUN dpkg --add-architecture i386 && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
autoconf \
automake \
dejagnu \
tcllib \
xvfb \
software-properties-common && \
apt-add-repository multiverse && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
a2ps \
abook \
acpi \
alpine \
android-tools-adb \
ant \
apache2 \
apache2-utils \
apt-build \
aptitude \
asciidoc \
aspell \
autoconf \
automake \
bc \
bind9-host \
bison \
bluez \
bridge-utils \
bsdgames \
ccache \
cfengine2 \
chrony \
chrpath \
cksfv \
clisp \
cowsay \
cppcheck \
cryptsetup-bin \
cups-bsd \
cups-client \
curl \
cvs \
cvsps \
deja-dup \
desktop-file-utils \
devscripts \
dict \
dnsutils \
dselect \
dsniff \
ebtables \
enscript \
eog \
evince \
expat \
fbi \
feh \
file-roller \
finger \
freeciv-client-gtk \
freeciv-server \
freerdp-x11 \
fuse \
gcj-jdk \
gcl \
gdb \
genisoimage \
gkrellm \
gnat-4.6 \
gnokii-cli \
gnome-mplayer \
gnupg2 \
gperf \
gphoto2 \
graphicsmagick \
graphicsmagick-imagemagick-compat \
graphviz \
growisofs \
grub \
hddtemp \
hping3 \
htop \
icedtea-netx \
idn \
iftop \
info \
iperf \
ipmitool \
iptables \
iputils-arping \
iputils-ping \
iputils-tracepath \
ipv6calc \
isc-dhcp-client \
jpegoptim \
k3b \
kcov \
kplayer \
krb5-user \
ldap-utils \
ldapvi \
lftp \
libcpanplus-perl \
liblz4-tool \
libuser \
libwww-perl \
lilo \
links \
lintian \
lrzip \
lsof \
lvm2 \
lzip \
lzop \
mailman \
man \
mariadb-client-5.5 \
mc \
mcrypt \
mdadm \
medusa \
mencoder \
minicom \
monodevelop \
mplayer-gui \
mr \
mtx \
munin-node \
mussh \
net-tools \
nethogs \
network-manager \
nfs-common \
ngrep \
nis \
nmap \
nodejs-legacy \
npm \
ntpdate \
open-iscsi-utils \
openjdk-7-jdk \
openswan \
optipng \
p7zip-full \
patchutils \
pciutils \
perl-doc \
pinfo \
pm-utils \
poppler-utils \
postgresql-client-9.3 \
postfix \
prelink \
protobuf-compiler \
puppet-common \
pwgen \
pyflakes \
pylint \
python-flake8 \
python-pytest \
python3 \
quota \
rcs \
rdesktop \
reportbug \
reptyr \
rfkill \
ri \
rpm \
rrdtool \
rsync \
samba-common-bin \
sbcl \
screen \
sharutils \
sitecopy \
smartmontools \
smbclient \
sqlite3 \
sshfs \
strace \
subversion \
sysbench \
tcpdump \
texinfo \
tshark \
unace \
unrar \
units \
unixodbc \
usbutils \
valgrind \
vorbis-tools \
vpnc \
wget \
wine \
wireless-tools \
wodim \
wvdial \
x11-xserver-utils \
xen-utils-common \
xserver-xorg-input-synaptics \
xsltproc \
xvnc4viewer \
xzdec \
yum \
yum-utils \
zopfli && \
npm install -g jshint
# When adding new completions, install packages desired for their testing here
# in case they're not in the base image, and remove later when the base image
# has caught up.
#RUN apt-get update \
# && \
# DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
# some-package
WORKDIR /usr/src/bash-completion
COPY . .

0 comments on commit ecaec9a

Please sign in to comment.