Skip to content

Commit

Permalink
Merge pull request #4 from unixelias/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
unixelias committed Jun 6, 2017
2 parents c358249 + c1c3924 commit fb91c3e
Show file tree
Hide file tree
Showing 10 changed files with 94 additions and 25 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
data/
bkp/
temas/
6 changes: 6 additions & 0 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
3 changes: 2 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ for i in $( ls docker); do
*-test ) ;;
* ) docker build -t unixelias/plone.idg:$i docker/$i ;;
esac
done
done

32 changes: 32 additions & 0 deletions docker/1.1.5-dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
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

# Para Pillow 2.7.0
RUN buildDeps="curl sudo python-setuptools python-dev python-ldap build-essential libldap2-dev libsasl2-dev libssl-dev libxml2-dev libxslt1-dev libbz2-dev libjpeg62-turbo-dev libyaml-dev libgeos-c1 libgeos-dev" \
&& runDeps="cron" \
&& apt-get update \
&& apt-get install -y --no-install-recommends $buildDeps \
&& apt-get install -y $runDeps \
&& sudo -u plone bin/buildout -c site.cfg -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

ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["start"]
23 changes: 23 additions & 0 deletions docker/1.1.5-dev/site.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[buildout]
extends =
buildout.cfg
https://raw.githubusercontent.com/unixelias/plone.idg/master/versions/1.1.5.2/versions.cfg
https://raw.githubusercontent.com/plonegovbr/portal.buildout/master/buildout.d/maintenance.cfg

[instance]
eggs +=
# Extensões mantidas pela comunidade PloneGov-BR
brasil.gov.portal
brasil.gov.facetada
brasil.gov.vlibrasnews
collective.opendata
# Extensões mantidas pelo Plone
plone.app.ldap
collective.lineage
collective.geo.bundle
collective.behavior.banner
collective.polls
Products.EasyNewsletter

[versions]
brasil.gov.portal = 1.1.5.1
4 changes: 3 additions & 1 deletion docker/1.1.5.1-debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ USER root
COPY Dockerfile /root/buildinfo

# 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" \
RUN buildDeps="curl sudo python-setuptools python-dev python-ldap build-essential libldap2-dev libsasl2-dev libssl-dev libxml2-dev libxslt1-dev libbz2-dev libjpeg62-turbo-dev libyaml-dev libgeos-c1 libgeos-dev" \
&& runDeps="cron" \
&& apt-get update \
&& apt-get install -y --no-install-recommends $buildDeps \
&& apt-get install -y $runDeps \
&& sudo -u plone bin/buildout -c site.cfg -t 300 \
&& SUDO_FORCE_REMOVE=yes apt-get purge -y --auto-remove $buildDeps \
&& rm -rf /var/lib/apt/lists/* \
Expand Down
22 changes: 12 additions & 10 deletions docker/1.1.5.1-debian/site.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,22 @@
extends =
buildout.cfg
https://raw.githubusercontent.com/unixelias/plone.idg/master/versions/1.1.5.1/versions.cfg
https://raw.githubusercontent.com/plonegovbr/portal.buildout/master/buildout.d/maintenance.cfg

[instance]
eggs +=
# Extensões mantidas pela comunidade PloneGov-BR
brasil.gov.portal
brasil.gov.facetada
brasil.gov.vlibrasnews
collective.opendata
brasil.gov.portal
brasil.gov.facetada
brasil.gov.vlibrasnews
collective.opendata
# Extensões mantidas pelo Plone
plone.app.ldap
collective.lineage
collective.geo.bundle
collective.behavior.banner
Products.EasyNewsletter
plone.app.ldap
collective.lineage
collective.geo.bundle
collective.behavior.banner
collective.polls
Products.EasyNewsletter

[versions]
brasil.gov.portal = 1.1.5.1
brasil.gov.portal = 1.1.5.1
4 changes: 3 additions & 1 deletion docker/1.1.5.2-debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ USER root
COPY Dockerfile /root/buildinfo

# 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" \
RUN buildDeps="curl sudo python-setuptools python-dev python-ldap build-essential libldap2-dev libsasl2-dev libssl-dev libxml2-dev libxslt1-dev libbz2-dev libjpeg62-turbo-dev libyaml-dev libgeos-c1 libgeos-dev" \
&& runDeps="cron" \
&& apt-get update \
&& apt-get install -y --no-install-recommends $buildDeps \
&& apt-get install -y $runDeps \
&& sudo -u plone bin/buildout -c site.cfg -t 300 \
&& SUDO_FORCE_REMOVE=yes apt-get purge -y --auto-remove $buildDeps \
&& rm -rf /var/lib/apt/lists/* \
Expand Down
22 changes: 12 additions & 10 deletions docker/1.1.5.2-debian/site.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,22 @@
extends =
buildout.cfg
https://raw.githubusercontent.com/unixelias/plone.idg/master/versions/1.1.5.2/versions.cfg

https://raw.githubusercontent.com/plonegovbr/portal.buildout/master/buildout.d/maintenance.cfg

[instance]
eggs +=
# Extensões mantidas pela comunidade PloneGov-BR
brasil.gov.portal
brasil.gov.facetada
brasil.gov.vlibrasnews
collective.opendata
brasil.gov.portal
brasil.gov.facetada
brasil.gov.vlibrasnews
collective.opendata
# Extensões mantidas pelo Plone
plone.app.ldap
collective.lineage
collective.geo.bundle
collective.behavior.banner
Products.EasyNewsletter
plone.app.ldap
collective.lineage
collective.geo.bundle
collective.behavior.banner
collective.polls
Products.EasyNewsletter

[versions]
brasil.gov.portal = 1.1.5.1
Binary file modified temas/ufvjm/img/logo-ufvjm.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit fb91c3e

Please sign in to comment.