summaryrefslogtreecommitdiffstats
path: root/99-ci-maipo/Dockerfile
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2016-02-03 17:45:57 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2016-02-03 17:45:57 +0100
commit49420a14aaff477b2b112bf1a361d583dcc2c56f (patch)
treeaa10f6f2ace1a963b48adbc125f134a03e5e17e1 /99-ci-maipo/Dockerfile
parente913b525a9c5423be9fe75a119453d9b80a25baf (diff)
downloaddocker-49420a14aaff477b2b112bf1a361d583dcc2c56f.tar.gz
Update some of the CI images to actually be able to do something
Diffstat (limited to '99-ci-maipo/Dockerfile')
-rw-r--r--99-ci-maipo/Dockerfile37
1 files changed, 6 insertions, 31 deletions
diff --git a/99-ci-maipo/Dockerfile b/99-ci-maipo/Dockerfile
index 05c2363..bb039ae 100644
--- a/99-ci-maipo/Dockerfile
+++ b/99-ci-maipo/Dockerfile
@@ -4,17 +4,12 @@ MAINTAINER Kolab Systems <vanmeeuwen@kolabsys.com>
ADD http://obs.kolabsys.com/repositories/Kolab:/Winterfell/CentOS_7/Kolab:Winterfell.repo \
/etc/yum.repos.d/Kolab:Winterfell.repo
-ADD http://obs.kolabsys.com/repositories/Kolab:/3.4/CentOS_7/Kolab:3.4.repo \
- /etc/yum.repos.d/Kolab:3.4.repo
-
-ADD http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/CentOS_7/Kolab:3.4:Updates.repo \
- /etc/yum.repos.d/Kolab:3.4:Updates.repo
+ADD http://obs.kolabsys.com/repositories/Kolab:/3.4/CentOS_7/Kolab:16.repo \
+ /etc/yum.repos.d/Kolab:16.repo
RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:Winterfell.repo
-RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:3.4.repo
-
-RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:3.4:Updates.repo
+RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:16.repo
RUN rpm --import https://ssl.kolabsys.com/community.asc
@@ -29,9 +24,6 @@ RUN sed -i \
/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 \* && \
-# yum clean all
-
ENV IMAGE maipo
ADD /dbus.service /etc/systemd/system/dbus.service
@@ -93,26 +85,9 @@ RUN wget \
-O/usr/local/lib/selenium-server-standalone.jar \
http://mirror.kolabsys.com/pub/releases/selenium-server-standalone.jar
-#WORKDIR /srv
-#RUN git clone https://github.com/SeleniumHQ/selenium.git selenium.git
-#WORKDIR /srv/selenium.git
-#RUN ./go --trace --verbose build
-#RUN ./go selenium-server-standalone
-
-WORKDIR /srv
-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/
-#RUN git clone https://github.com/ariya/phantomjs.git phantomjs.git
-#WORKDIR /srv/phantomjs.git
-#RUN ./build.sh --confirm
-
-ADD /functions.sh /
-ADD entrypoint.sh /
+ADD /functions.sh /functions.sh
+ADD /entrypoint.sh /entrypoint.sh
-RUN chmod 755 /entrypoint.sh
+RUN chmod a+x /entrypoint.sh
ENTRYPOINT [ "/entrypoint.sh" ]