Merge pull request #5 from unixelias/dev2

Refatoração e adição do Varnish

build.sh

@@ -1,9 +1,17 @@
-#!/bin/bash
+ #!/bin/bash
 shopt -s extglob
 
 for i in $( ls docker); do
-  case "$i" in
-       *-test )  ;;
-       * ) docker build -t unixelias/plone.idg:$i docker/$i && docker push unixelias/plone.idg:$i ;;
-  esac
+ case "$i" in
+      *-test )  ;;
+      * ) docker build -t unixelias/plone.idg:$i \
+                   --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+                   --build-arg VCS_REF=`git rev-parse --short HEAD` docker/$i \
+                   && docker push unixelias/plone.idg:$i ;;
+ esac
 done
+
+# docker build -t unixelias/plone.idg:1.1.5-dev \
+#         --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+#         --build-arg VCS_REF=`git rev-parse --short HEAD` docker/1.1.5-dev \
+#         && docker push unixelias/plone.idg:1.1.5-dev

docker-compose.yml

@@ -1,12 +1,28 @@
 version: "2"
 services:
+  varnish:
+    hostname: 'varnish'
+    image: eeacms/varnish
+    restart: 'always'
+    depends_on:
+      - haproxy
+    ports:
+      - 8080:6081/tcp
+    environment:
+      - BACKENDS=haproxy
+      - BACKENDS_PORT=5000
+      - BACKENDS_PROBE_INTERVAL=3s
+      - BACKENDS_PROBE_THRESHOLD=2
+      - BACKENDS_PROBE_TIMEOUT=1s
+      - BACKENDS_PROBE_WINDOW=3
+      - DNS_ENABLED=true
+
   haproxy:
     image: eeacms/haproxy
     restart: 'always'
     depends_on:
       - ploneidg
     ports:
-      - 8080:5000
       - 1936:1936
     environment:
       - BACKENDS=ploneidg

docker/1.1.5.1-debian/Dockerfile

@@ -1,9 +1,26 @@
 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" \
+
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL Name="Plone v4.3 IDG" \
       Version="1.1.5.1" \
       Architecture="x86_64" \
-      Dockerfile_location="/root/buildinfo"
+      Dockerfile_location="/root/buildinfo" \
+      org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name="Plone v4.3 IDG" \
+      org.label-schema.description="Modelo Plone v4.3 IDG escrito para implementação no Portal da UFVJM" \
+      org.label-schema.url="http://portal.ufvjm.edu.br/" \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/unixelias/plone.idg" \
+      org.label-schema.vendor="Elias Alves at UFVJM" \
+      org.label-schema.version="1.1.5" \
+      org.label-schema.version="1.1.5.1" \
+      org.label-schema.version="stable" \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.docker.cmd="docker run -p 8080:8080 -v ./data:/data unixelias/plone.idg"
 
 USER plone
 COPY site.cfg /plone/instance/
@@ -12,10 +29,28 @@ 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" \
+RUN buildDeps=" \
+          build-essential \
+          curl \
+          libbz2-dev \
+          libldap2-dev \
+          libjpeg62-turbo-dev \
+          libgeos-c1 \
+          libgeos-dev \
+          libsasl2-dev \
+          libssl-dev \
+          libyaml-dev \
+          libxml2-dev \
+          libxslt1-dev \
+          python-dev python-ldap \
+          python-setuptools \
+          sudo \
+          " \
  && runDeps="cron" \
  && apt-get update \
+ ## Instala as dependências para tempo de compilação
  && apt-get install -y --no-install-recommends $buildDeps \
+ ## Instala as dependências para tempo de execução
  && 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 \

docker/1.1.5.2-debian/Dockerfile

@@ -1,9 +1,26 @@
 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" \
+
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL Name="Plone v4.3 IDG" \
       Version="1.1.5.2" \
       Architecture="x86_64" \
-      Dockerfile_location="/root/buildinfo"
+      Dockerfile_location="/root/buildinfo" \
+      org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name="Plone v4.3 IDG" \
+      org.label-schema.description="Modelo Plone v4.3 IDG escrito para implementação no Portal da UFVJM" \
+      org.label-schema.url="http://portal.ufvjm.edu.br/" \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/unixelias/plone.idg" \
+      org.label-schema.vendor="Elias Alves at UFVJM" \
+      org.label-schema.version="1.1.5" \
+      org.label-schema.version="1.1.5.2" \
+      org.label-schema.version="stable" \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.docker.cmd="docker run -p 8080:8080 -v ./data:/data unixelias/plone.idg"
 
 USER plone
 COPY site.cfg /plone/instance/
@@ -12,10 +29,28 @@ 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" \
+RUN buildDeps=" \
+          build-essential \
+          curl \
+          libbz2-dev \
+          libldap2-dev \
+          libjpeg62-turbo-dev \
+          libgeos-c1 \
+          libgeos-dev \
+          libsasl2-dev \
+          libssl-dev \
+          libyaml-dev \
+          libxml2-dev \
+          libxslt1-dev \
+          python-dev python-ldap \
+          python-setuptools \
+          sudo \
+          " \
  && runDeps="cron" \
  && apt-get update \
+ ## Instala as dependências para tempo de compilação
  && apt-get install -y --no-install-recommends $buildDeps \
+ ## Instala as dependências para tempo de execução
  && 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 \

docker/1.1.5.3-debian/Dockerfile

@@ -1,9 +1,27 @@
 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" \
+
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL Name="Plone v4.3 IDG" \
       Version="1.1.5.3" \
       Architecture="x86_64" \
-      Dockerfile_location="/root/buildinfo"
+      Dockerfile_location="/root/buildinfo" \
+      org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name="Plone v4.3 IDG" \
+      org.label-schema.description="Modelo Plone v4.3 IDG escrito para implementação no Portal da UFVJM" \
+      org.label-schema.url="http://portal.ufvjm.edu.br/" \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/unixelias/plone.idg" \
+      org.label-schema.vendor="Elias Alves at UFVJM" \
+      org.label-schema.version="1.1.5" \
+      org.label-schema.version="1.1.5.3" \
+      org.label-schema.version="stable" \
+      org.label-schema.version="latest" \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.docker.cmd="docker run -p 8080:8080 -v ./data:/data unixelias/plone.idg"
 
 USER plone
 COPY site.cfg /plone/instance/
@@ -12,10 +30,28 @@ 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" \
+RUN buildDeps=" \
+          build-essential \
+          curl \
+          libbz2-dev \
+          libldap2-dev \
+          libjpeg62-turbo-dev \
+          libgeos-c1 \
+          libgeos-dev \
+          libsasl2-dev \
+          libssl-dev \
+          libyaml-dev \
+          libxml2-dev \
+          libxslt1-dev \
+          python-dev python-ldap \
+          python-setuptools \
+          sudo \
+          " \
  && runDeps="cron" \
  && apt-get update \
+ ## Instala as dependências para tempo de compilação
  && apt-get install -y --no-install-recommends $buildDeps \
+ ## Instala as dependências para tempo de execução
  && 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 \
@@ -29,4 +65,5 @@ USER plone
 EXPOSE 8080
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
+
 CMD ["start"]

repo_build.sh

@@ -1,2 +1,3 @@
 #!/bin/bash
 curl -H 'Content-Type: application/json' --data '{"build": true}' -X POST https://registry.hub.docker.com/u/unixelias/plone.idg/trigger/$TRIGGER_TOKEN/
+curl -X POST https://hooks.microbadger.com/images/unixelias/plone.idg/UqI2jjYcxbC3LKRwYp90UHNiNZE=