From 2bf86b93cc1927f2cedeeb10a7895b81ea987660 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Wed, 9 Mar 2016 09:07:20 +0100 Subject: Guam comes from packaging for this branch --- 03-guam/Dockerfile | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/03-guam/Dockerfile b/03-guam/Dockerfile index cde91c7..f0f1b84 100644 --- a/03-guam/Dockerfile +++ b/03-guam/Dockerfile @@ -3,47 +3,15 @@ FROM kolab/base:latest ENV GUAM_BRANCH master RUN yum -y install \ - erlang-eimap \ - erlang-erts \ - erlang-goldrush \ - erlang-lager \ - erlang-rebar \ - make && \ + guam && \ yum clean all -RUN git clone \ - -b ${GUAM_BRANCH} \ - https://git.kolab.org/diffusion/G/guam.git \ - /root/guam.git - -WORKDIR /root/guam.git/ - -RUN timeout 60s rebar get-deps -RUN timeout 60s rebar compile -RUN timeout 60s rebar eunit -RUN mkdir -p deps - -WORKDIR /root/guam.git/rel/ - -RUN timeout 60s rebar generate - -WORKDIR /root/guam.git/ - ADD /entrypoint.sh /entrypoint.sh RUN chmod a+x /entrypoint.sh -RUN mkdir -p \ - /etc/guam/ && \ - mv -v \ - $(ls -1d /root/guam.git/rel/kolab_guam/releases/*/)/sys.config \ - /etc/guam/sys.config && \ - ln -s \ - /etc/guam/sys.config \ - $(ls -1d /root/guam.git/rel/kolab_guam/releases/*/)/. - EXPOSE 143 993 CMD [ \ - "rel/kolab_guam/bin/kolab_guam", \ + "/usr/bin/guam", \ "foreground" \ ] -- cgit v1.1