Merge branch 'develop' into master

build.sh

@@ -1,9 +1,11 @@
  #!/bin/bash
 shopt -s extglob
 
-for i in $( ls docker); do
-  case "$i" in
-       *-test )  ;;
-       * ) docker build -t unixelias/plone.idg:$i docker/$i ;;
-  esac
-done
+#for i in $( ls docker); do
+#  case "$i" in
+#       *-test )  ;;
+#       * ) docker build -t unixelias/plone.idg:$i docker/$i ;;
+#  esac
+#done
+
+docker build -t unixelias/plone.idg:1.1.5-x docker/1.1.5-xmldirector

docker/1.1.5-xmldirector/Dockerfile

@@ -0,0 +1,54 @@
+FROM plone:4.3
+MAINTAINER Elias Alves <elias.alves@ufvjm.edu.br>
+LABEL Name="Modelo Plone v4.3 IDG escrito para implementação no Portal da UFVJM" \
+      Version="1.1.5.2" \
+      Architecture="x86_64" \
+      Dockerfile_location="/root/buildinfo"
+
+USER plone
+COPY site.cfg /plone/instance/
+
+USER root
+COPY Dockerfile /root/buildinfo
+
+#Dependências xmldirector
+#Instalação do Java
+#RUN echo deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main >> /etc/apt/sources.list.d/webupd8team-java.list
+#RUN echo deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main >> /etc/apt/sources.list.d/webupd8team-java.list
+#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886
+RUN apt-get update
+#RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
+#RUN apt-get install --fix-missing -y oracle-java8-installer
+#RUN apt-get install oracle-java8-set-default
+#Instala demais dependências
+RUN apt-get install -y python-virtualenv zlib1g-dev git-core wv expect gettext net-tools libprocps-dev patch libffi-dev libcurl4-openssl-dev
+
+# Para Pillow 2.7.0
+RUN buildDeps="curl sudo python-setuptools python-dev build-essential libldap2-dev libsasl2-dev libssl-dev libxml2-dev libxslt1-dev libbz2-dev libjpeg62-turbo-dev libyaml-dev libgeos-c1 libgeos-dev" \
+ && apt-get install -y --no-install-recommends $buildDeps
+
+RUN virtualenv .
+RUN git clone https://github.com/xml-director/xmldirector.plonecore.git
+
+WORKDIR xmldirector.plonecore
+RUN git pull
+RUN ../bin/python bootstrap.py --setuptools-version=7.0 --version=2.2.5 -c buildout-plone-4.3.cfg
+
+WORKDIR /plone/instance
+COPY base.cfg /plone/instance/
+COPY dev-base.cfg /plone/instance/
+COPY buildout-plone-4.3.cfg /plone/instance/
+RUN rsync -apErvh /plone/instance/xmldirector.plonecore /plone/instance/
+RUN sudo -u plone bin/buildout -c base.cfg \
+  && sudo -u plone bin/buildout -c site.cfg -Nv -t 300 \
+  && SUDO_FORCE_REMOVE=yes apt-get purge -y --auto-remove $buildDeps \
+  && rm -rf /var/lib/apt/lists/* \
+  && rm -rf /plone/buildout-cache/downloads/* \
+  && apt-get clean \
+  && find /plone \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -rf '{}' +
+USER plone
+
+EXPOSE 8080 12120
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["start"]

docker/1.1.5-xmldirector/base.cfg

@@ -0,0 +1,16 @@
+
+[buildout]
+extends =
+    buildout-plone-4.3.cfg
+
+[sources]
+xmldirector.demo = git  https://github.com/xml-director/xmldirector.demo.git
+xmldirector.crex = git https://github.com/xml-director/xmldirector.crex.git
+xmldirector.dropbox = git https://github.com/xml-director/xmldirector.dropbox.git
+xmldirector.twitter = git https://github.com/xml-director/xmldirector.twitter.git
+xmldirector.facebook = git https://github.com/xml-director/xmldirector.facebook.git
+xmldirector.bookalope = git https://github.com/xml-director/xmldirector.bookalope.git
+xmldirector.dita = git https://github.com/xml-director/xmldirector.dita.git
+pp.client-python = git  https://bitbucket.org/ajung/pp.client-python.git
+pp.client-plone = git  https://bitbucket.org/ajung/pp.client-plone.git
+vs.bootstrap.plonetheme = git https://github.com/xml-director/vs.bootstrap.plonetheme.git

docker/1.1.5-xmldirector/buildout-plone-4.3.cfg

@@ -0,0 +1,5 @@
+[buildout]
+
+extends =
+    https://raw.github.com/collective/buildout.plonetest/master/test-4.3.x.cfg
+    dev-base.cfg

docker/1.1.5-xmldirector/dev-base.cfg

@@ -0,0 +1,132 @@
+[buildout]
+parts +=
+    test
+    test-crex
+    zeo
+    instance-zeo
+    instance-worker
+    compile-resources
+
+auto-checkout =
+    xmldirector.demo
+    pp.client-plone
+    pp.client-python
+    xmldirector.crex
+    xmldirector.dropbox
+    xmldirector.twitter
+    xmldirector.facebook
+    xmldirector.bookalope
+    xmldirector.dita
+    vs.bootstrap.plonetheme
+#    yafowil.plone
+
+[zeo]
+recipe = plone.recipe.zeoserver
+zeo-address = 127.0.0.1:12000
+
+
+[instance]
+eggs +=
+    pp.client-plone
+    xmldirector.demo
+    pp.client-plone
+    xmldirector.crex
+    xmldirector.dropbox
+    xmldirector.bookalope
+    xmldirector.dita
+    xmldirector.twitter
+    xmldirector.facebook
+    zope.globalrequest
+    collective.taskqueue [redis]
+
+zcml +=
+#    xmldirector.demo
+    xmldirector.dropbox
+    xmldirector.bookalope
+    xmldirector.facebook
+
+
+zope-conf-additional =
+    %import collective.taskqueue
+    <taskqueue>
+    queue crex
+    </taskqueue>
+    <taskqueue-server>
+    queue crex
+    concurrent_limit 1
+    </taskqueue-server>
+
+
+[instance-zeo]
+<=instance
+http-address = 12081
+zeo-address = 12000
+zeo-client = on
+shared-blob = on
+zope-conf-additional =
+    %import collective.taskqueue
+    <taskqueue>
+    queue crex
+    type redis
+    </taskqueue>
+
+[instance-worker]
+<=instance
+http-address = 12082
+zeo-address = 12000
+zeo-client = on
+shared-blob = on
+zope-conf-additional =
+    %import collective.taskqueue
+    <taskqueue>
+    queue crex
+    type redis
+    </taskqueue>
+    <taskqueue-server>
+    queue crex
+    concurrent_limit 1
+    </taskqueue-server>
+
+
+[sources]
+xmldirector.demo = git git@github.com:xml-director/xmldirector.demo.git
+pp.client-plone = git git@bitbucket.org:ajung/pp.client-plone.git
+pp.client-python = git git@bitbucket.org:ajung/pp.client-python.git
+xmldirector.crex = git git@github.com:xml-director/xmldirector.crex.git
+xmldirector.dropbox = git git@github.com:xml-director/xmldirector.dropbox.git
+xmldirector.bookalope = git git@github.com:xml-director/xmldirector.bookalope.git
+xmldirector.twitter = git git@github.com:xml-director/xmldirector.twitter.git
+xmldirector.facebook = git git@github.com:xml-director/xmldirector.facebook.git
+xmldirector.dita = git git@github.com:xml-director/xmldirector.dita.git
+xmldirector.bookalope = git git@github.com:xml-director/xmldirector.bookalope.git
+vs.bootstrap.plonetheme = git git@github.com:xml-director/vs.bootstrap.plonetheme.git
+yafowil.plone = git git@github.com:bluedynamics/yafowil.plone.git branch=plone5
+
+
+[test]
+recipe = zc.recipe.testrunner
+defaults = ['--auto-color', '--auto-progress']
+eggs =
+    xmldirector.plonecore
+
+
+[test-crex]
+recipe = zc.recipe.testrunner
+defaults = ['--auto-color', '--auto-progress']
+eggs =
+    xmldirector.crex
+
+[coverage]
+recipe = zc.recipe.egg
+eggs = coverage
+initialization =
+    include = '--source=${buildout:directory} '
+    sys.argv = sys.argv[:] + ['run', include, 'bin/test', '--layer=PloneApiLayer:Integration']
+
+[versions]
+plone.app.jquery = 1.8.3
+
+[compile-resources]
+recipe = zc.recipe.egg
+eggs = Products.CMFPlone
+scripts = plone-compile-resources

docker/1.1.5-xmldirector/site.cfg

@@ -0,0 +1,20 @@
+[buildout]
+extends =
+    buildout.cfg
+    http://raw.githubusercontent.com/unixelias/portalpadrao.release/master/1.1.5.2/versions.cfg
+
+[instance]
+eggs +=
+  brasil.gov.portal
+  brasil.gov.facetada
+  brasil.gov.vlibrasnews
+  collective.opendata
+  plone.app.ldap
+  collective.lineage
+  collective.geo.bundle
+  collective.behavior.banner
+  Products.EasyNewsletter
+  xmldirector.plonecore
+
+[versions]
+brasil.gov.portal       = 1.1.5.1