diff options
| author | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2015-12-29 14:25:42 +0100 |
|---|---|---|
| committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2015-12-29 14:25:42 +0100 |
| commit | ea216f3a4be8dae7ff8dc863a00b573e5c7979b4 (patch) | |
| tree | ee7fdf11e2a1aaac5fb70fbfff5d534c75edcc72 | |
| parent | 4334a6e7458e1be9b44523a6aff1af3a9ae82089 (diff) | |
| download | docker-ea216f3a4be8dae7ff8dc863a00b573e5c7979b4.tar.gz | |
Override installation languages, install wget, optimize pulling in phantomjs
| -rw-r--r-- | 99-ci-maipo/Dockerfile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/99-ci-maipo/Dockerfile b/99-ci-maipo/Dockerfile index 3f97390..01c83bd 100644 --- a/99-ci-maipo/Dockerfile +++ b/99-ci-maipo/Dockerfile @@ -23,10 +23,14 @@ ADD http://download.opensuse.org/repositories/openSUSE:Tools/CentOS_7/openSUSE:T RUN rpm --import http://download.opensuse.org/repositories/openSUSE:/Tools/CentOS_7/repodata/repomd.xml.key -RUN sed -i -e '/tsflags=nodocs/d' /etc/yum.conf && \ +RUN sed -i \ + -e '/tsflags=nodocs/d' \ + -e '/override_install_langs/d' \ + /etc/yum.conf && \ sed -r -i -e 's/enabled\s*=\s*1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf -#RUN yum -y reinstall \* +#RUN yum -y reinstall \* && \ +# yum clean all ENV IMAGE maipo @@ -72,6 +76,7 @@ RUN yum clean all && \ telnet \ traceroute \ vim-enhanced \ + wget \ yum-utils && \ yum clean all @@ -90,10 +95,10 @@ ADD http://mirror.kolabsys.com/pub/releases/selenium-server-standalone.jar /usr/ #RUN ./go --trace --verbose build #RUN ./go selenium-server-standalone -ADD http://mirror.kolabsys.com/pub/releases/phantomjs-1.9.7-linux-x86_64.tar.bz2 /srv/ WORKDIR /srv -RUN tar jxvf phantomjs-1.9.7-linux-x86_64.tar.bz2 -RUN cp phantomjs-1.9.7-linux-x86_64/bin/phantomjs /usr/local/bin/ && \ +RUN wget http://mirror.kolabsys.com/pub/releases/phantomjs-1.9.7-linux-x86_64.tar.bz2 && \ + tar jxvf phantomjs-1.9.7-linux-x86_64.tar.bz2 && \ + cp phantomjs-1.9.7-linux-x86_64/bin/phantomjs /usr/local/bin/ && \ rm -rf phantomjs-1.9.7-linux-x86_64* #WORKDIR /srv/ |