Merge pull request #1 from SolidNerd/refactoring

Refactoring

Author: solidnerd

.gitlab-ci.yml

@@ -0,0 +1,41 @@
+image: docker:1.11.2
+
+stages:
+- build
+- test
+- prerelease
+- release
+
+before_script:
+  - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
+
+build:
+  stage: build
+  script:
+    - docker build -t $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME .
+
+prerelease:
+  stage: prerelease
+  script:
+    - docker push $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
+    - docker rmi $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
+
+release-version:
+  stage: release
+  script:
+    - docker pull $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
+    - docker tag $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME $CI_REGISTRY_IMAGE:$(cat VERSION)
+    - docker push $CI_REGISTRY_IMAGE:$(cat VERSION)
+    - docker rmi $CI_REGISTRY_IMAGE:$(cat VERSION)
+  only:
+    - master
+
+release-latest:
+  stage: release
+  script:
+    - docker pull $CI_REGISTRY_IMAGE:CI_BUILD_REF_NAME
+    - docker tag $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME $CI_REGISTRY_IMAGE:latest
+    - docker push $CI_REGISTRY_IMAGE:latest
+    - docker rmi $CI_REGISTRY_IMAGE:latest
+  only:
+    - master

Dockerfile

@@ -1,11 +1,14 @@
-FROM alpine:3.3
+FROM alpine:3.4
 MAINTAINER Niclas Mietz niclas@mietz.io
 
-ENV RAINLOOP_VERSION 1.10.1.127
+ENV RAINLOOP_VERSION 1.10.2.141
+ENV RAINLOOP_BUILD /etc/rainloop
 ENV RAINLOOP_HOME /var/www/rainloop
 ENV RAINLOOP_EDITION  rainloop-community-latest.zip
 ENV RAINLOOP_DOWNLOAD http://repository.rainloop.net/v2/webmail/${RAINLOOP_EDITION}
-ENV REQUIRED_PACKAGES apache2 php-apache2 php-openssl php-xml php-json php-iconv php-curl php-pdo_mysql php-pdo_pgsql php-pdo_sqlite php-dom php-zlib
+ENV RAINLOOP_CLONE_URL "https://github.com/RainLoop/rainloop-webmail.git"
+
+ENV REQUIRED_PACKAGES apache2 php5-apache2 php5-openssl php5-xml php5-json php5-iconv php5-curl php5-pdo_mysql php5-pdo_pgsql php5-pdo_sqlite php5-dom php5-zlib
 
 RUN \
   apk add -U $REQUIRED_PACKAGES && \
@@ -14,15 +17,18 @@ RUN \
   rm -fr /usr/bin/php
 
 
-RUN apk add -U unzip findutils && \
-    mkdir -p ${RAINLOOP_HOME}  && \
-    cd ${RAINLOOP_HOME} && \
-    curl -O ${RAINLOOP_DOWNLOAD} && \
-    unzip ${RAINLOOP_EDITION} && \
-    rm ${RAINLOOP_EDITION} && \
-    apk del --purge unzip && \
-    rm -fr /var/cache/apk/* && \
-    rm -fr /tmp/*
+RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
+    echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories  && \
+    apk add -U git nodejs findutils && \
+    npm install gulp -g && \
+    git clone -q -b v${RAINLOOP_VERSION} --depth 1  ${RAINLOOP_CLONE_URL} ${RAINLOOP_BUILD}  && \
+    cd ${RAINLOOP_BUILD} && \
+    npm install && \
+    gulp rainloop:start && \
+    mv build/dist/releases/webmail/${RAINLOOP_VERSION}/src ${RAINLOOP_HOME} && \
+    npm uninstall -g gulp && \
+    apk del --purge git nodejs && \
+    rm -fr ${RAINLOOP_BUILD} /root/.npm /tmp/* /var/cache/apk/*
 
 ADD httpd.conf /etc/apache2/httpd.conf
 

VERSION

@@ -0,0 +1 @@
+1.10.2.141