summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2015-12-23 11:45:41 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2015-12-23 11:45:41 +0100
commit3ef9450fb12eb1abec033f0e0c0e87f247896dee (patch)
tree00c04574277eb1bb27d68b59bfa3561078445907
parentdee5776f0b48f15be41ce6f72c2ad245b0a8d1f7 (diff)
downloaddocker-3ef9450fb12eb1abec033f0e0c0e87f247896dee.tar.gz
Check in master from atomicapp repo
-rw-r--r--00-base/Dockerfile2
-rw-r--r--01-base-nodejs/Dockerfile1
-rw-r--r--03-guam/Dockerfile39
-rwxr-xr-x03-guam/entrypoint.sh2
-rw-r--r--03-jmap-proxy/Dockerfile1
5 files changed, 40 insertions, 5 deletions
diff --git a/00-base/Dockerfile b/00-base/Dockerfile
index f3dd463..8c6959b 100644
--- a/00-base/Dockerfile
+++ b/00-base/Dockerfile
@@ -35,6 +35,8 @@ RUN yum -y install yum-plugin-priorities && \
RUN yum -y install \
bind-utils \
cyrus-imapd \
+ cyrus-sasl-plain \
+ git \
lsof \
net-tools \
nmap-ncat \
diff --git a/01-base-nodejs/Dockerfile b/01-base-nodejs/Dockerfile
index 803bce1..aa5fd8f 100644
--- a/01-base-nodejs/Dockerfile
+++ b/01-base-nodejs/Dockerfile
@@ -29,7 +29,6 @@ ENV NODE_VERSION=0.12.8
# printf '\n# Node.js\nexport PATH="node_modules/.bin:$PATH"' >> /root/.bashrc
RUN yum -y install \
- git \
libjpeg-turbo-utils \
libpng-devel \
nodejs \
diff --git a/03-guam/Dockerfile b/03-guam/Dockerfile
index cf57806..cde91c7 100644
--- a/03-guam/Dockerfile
+++ b/03-guam/Dockerfile
@@ -1,16 +1,49 @@
FROM kolab/base:latest
-RUN yum -y install guam && \
+ENV GUAM_BRANCH master
+
+RUN yum -y install \
+ erlang-eimap \
+ erlang-erts \
+ erlang-goldrush \
+ erlang-lager \
+ erlang-rebar \
+ make && \
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
-ADD /sys.config /etc/guam/sys.config
+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 [ \
- "/usr/sbin/guam", \
+ "rel/kolab_guam/bin/kolab_guam", \
"foreground" \
]
diff --git a/03-guam/entrypoint.sh b/03-guam/entrypoint.sh
index ebac8a8..ca740db 100755
--- a/03-guam/entrypoint.sh
+++ b/03-guam/entrypoint.sh
@@ -14,6 +14,8 @@ fi
sed -r -i \
-e "s/host, \"127\.0\.0\.1\"/host, \"${KOLAB_IMAPF_EXT_SERVICE_HOST}\"/g" \
+ -e "s/port, 9143/port, 143/g" \
+ -e "s/port, 9993/port, 993/g" \
/etc/guam/sys.config
$@
diff --git a/03-jmap-proxy/Dockerfile b/03-jmap-proxy/Dockerfile
index 25e2b8f..b4d4ce9 100644
--- a/03-jmap-proxy/Dockerfile
+++ b/03-jmap-proxy/Dockerfile
@@ -5,7 +5,6 @@ RUN yum -y install epel-release && \
yum -y install \
@fedora-packager \
gcc \
- git \
libuuid-devel \
net-tools \
nginx \