Merge branch '3.5'

Dockerfile

@@ -1,11 +1,9 @@
-FROM alpine:3.4
+FROM alpine:3.5
 MAINTAINER Daniel Guerra
 ADD /apk /apk
-RUN cp /apk/.abuild/-58b7ee0c.rsa.pub /etc/apk/keys
+RUN cp /apk/.abuild/-58b83ac3.rsa.pub /etc/apk/keys
-RUN apk --update add /apk/ossp-uuid-1.6.2-r0.apk
+RUN apk --no-cache --update add /apk/x11vnc-0.9.13-r0.apk
-RUN apk add /apk/ossp-uuid-dev-1.6.2-r0.apk
+RUN apk --no-cache add xvfb openbox xfce4-terminal supervisor sudo \
-RUN apk add /apk/x11vnc-0.9.13-r0.apk
-RUN apk add xvfb openbox xfce4-terminal supervisor sudo \
 && addgroup alpine \
 && adduser  -G alpine -s /bin/sh -D alpine \
 && echo "alpine:alpine" | /usr/sbin/chpasswd \

apk/.abuild/-58b7ee0c.rsa.pub

@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsilmXwFAT2QzXVyuyGjs
-sgwhM873glsWBd8sHzdpi08zkSs/oY5r/3iVLs9kQ39MmIUUnbwLTvlFgRq/GEvD
-q3Db2Awq7TVAzOvQZCvW7qTYAon/Ay8Ijihhz+1rPh7PKVycuxwSUs5TGEXI1EkG
-G1NqM9Hu1d8W6wIm8qcu2x1FX03NImarlgbrhx9MaoKU4VPUQdBM9sxifbLN1aAH
-3IhJbCO600rUg5liiWu5UEk3YP9WFjx1xXXnNsQ56jJRbWBCV5usSjJV3HvwzmLZ
-lT/CM8QNwzC9XFeWh2XsDewkzQ1gNr8XgmtnBDHF/+LClBhYS/Jk7vWNDPaQbp87
-owIDAQAB
------END PUBLIC KEY-----

apk/.abuild/-58b83ac3.rsa.pub

@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsScqFpw/xdeDGzISSiaa
+3BCqR/8qJOVjv+V5nlqcPkeXW96EuXS1VK9Vx/vcGHvbw8TGR4jZtXYI2oA+3pD2
+4bZcpfFUB3CVcz54T8zMw5CaC/JmS4hKbMudw9UQxPwVERgBAQHJJGENgTUlfj5Q
+Q7QQ/bqvAp1z81ZF3ZRAgLAYZZRXFUpjCPm4MkpHjIBphLlDPTMTuhVD3vN4swFR
+C/siJfpElppkmPUyGhWSBzbzsPgcn6CtKfDvvhNe8xWjCx89io32B6oTjFr+XXo2
+zrwoyQXYQijvE1ItaC6UFRjxayHD3euzMnAhweYGOugYqRGfFvKUPIGsEfiU65Hx
+CQIDAQAB
+-----END PUBLIC KEY-----

apk/.abuild/abuild.conf

@@ -1 +0,0 @@
-PACKAGER_PRIVKEY="/home/sdk/.abuild/-57cfc5fa.rsa"