summaryrefslogtreecommitdiffstats
path: root/ci/maipo
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2015-05-26 13:47:21 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2015-05-26 13:47:21 +0200
commit6f983180c81ce2faa5f25b81913c2033ab9679d6 (patch)
tree9e3193a36a664a93f8d1f02dca8a602a976a87e2 /ci/maipo
parent3471c2abc3ae0350774ead175579f7fdc17bda5d (diff)
downloaddocker-6f983180c81ce2faa5f25b81913c2033ab9679d6.tar.gz
Split entrypoint and functions
Diffstat (limited to 'ci/maipo')
-rw-r--r--ci/maipo22
1 files changed, 16 insertions, 6 deletions
diff --git a/ci/maipo b/ci/maipo
index b9df11e..ed69045 100644
--- a/ci/maipo
+++ b/ci/maipo
@@ -1,4 +1,4 @@
-FROM centos:centos7
+FROM docker.io/centos:centos7
MAINTAINER Kolab Systems <vanmeeuwen@kolabsys.com>
ADD http://obs.kolabsys.com/repositories/Kolab:/Development/CentOS_7/Kolab:Development.repo \
@@ -16,13 +16,13 @@ RUN yum -y reinstall \*
ENV IMAGE maipo
-ADD https://raw.githubusercontent.com/adelton/docker-freeipa/master/dbus.service /etc/systemd/system/dbus.service
+ADD http://cgit.kolab.org/docker/plain/ci/files.d/dbus.service /etc/systemd/system/dbus.service
RUN ln -sf dbus.service /etc/systemd/system/messagebus.service
-ADD https://raw.githubusercontent.com/adelton/docker-freeipa/master/httpd.service /etc/systemd/system/httpd.service
+ADD http://cgit.kolab.org/docker/plain/ci/files.d/httpd.service /etc/systemd/system/httpd.service
-ADD https://raw.githubusercontent.com/adelton/docker-freeipa/master/systemctl /usr/bin/systemctl
-ADD https://raw.githubusercontent.com/adelton/docker-freeipa/master/systemctl-socket-daemon /usr/bin/systemctl-socket-daemon
+ADD http://cgit.kolab.org/docker/plain/ci/files.d/systemctl /usr/bin/systemctl
+ADD http://cgit.kolab.org/docker/plain/ci/files.d/systemctl-socket-daemon /usr/bin/systemctl-socket-daemon
RUN chmod -v a+rx \
/usr/bin/systemctl \
@@ -38,6 +38,7 @@ RUN yum clean all && \
build \
cairo-devel.i686 \
fontconfig-devel.i686 \
+ freetype-devel \
freetype-devel.i686 \
gcc.i686 \
gcc-c++.i686 \
@@ -46,6 +47,7 @@ RUN yum clean all && \
glibc-devel \
glibc-devel.i686 \
glib2-devel.i686 \
+ gperf \
gtk2-devel \
gtk2-devel.i686 \
ibus-devel \
@@ -57,6 +59,7 @@ RUN yum clean all && \
perl-TimeDate \
python-selenium \
rpmdevtools \
+ ruby \
sudo \
vim-enhanced \
yum-utils \
@@ -69,7 +72,7 @@ RUN yum clean all && \
list available 2>&1 | \
grep -vE "^(Available Packages|\s+)" | \
awk '{print $1}' \
- )
+ ) qt5-qtbase
WORKDIR /srv
RUN git clone https://github.com/google/closure-compiler.git closure-compiler.git
@@ -81,11 +84,18 @@ RUN git clone https://github.com/SeleniumHQ/selenium.git selenium.git
WORKDIR /srv/selenium.git
RUN ./go --trace --verbose build
+WORKDIR /srv/
+RUN git clone https://github.com/ariya/phantomjs.git phantomjs.git
+WORKDIR /srv/phantomjs.git
+RUN ./build.sh --confirm
+
WORKDIR /srv
ADD https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 /srv/phantomjs-1.9.7-linux-x86_64.tar.bz2
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
+ADD https://cgit.kolab.org/docker/plain/ci/functions.sh /
+
ADD https://cgit.kolab.org/docker/plain/ci/entrypoint.sh /
RUN chmod 755 /entrypoint.sh
ENTRYPOINT [ "/entrypoint.sh" ]