prep for 18.04

docker/glastopf/Dockerfile

@@ -1,22 +1,52 @@
-FROM alpine 
-MAINTAINER MO 
+FROM alpine
 
 # Include dist
 ADD dist/ /root/dist/
 
 # Install packages
-RUN apk -U upgrade && \
-    apk add autoconf bash bind-tools build-base cython git libffi libffi-dev make py-asn1 \
-            py-cffi py-chardet py-chardet py-cparser py-cryptography py-dateutil \
-            py-enum34 py-idna py-ipaddress py-jinja2 py-lxml py-mysqldb py-openssl \
-            py-pip py-requests py-setuptools python python-dev && \
+RUN apk -U --no-cache add autoconf \
+               bash \
+               bind-tools \
+               build-base \
+               cython \
+               git \
+               libffi \
+               libffi-dev \
+               libcap \
+               make \
+               py-asn1 \
+               py-cffi \
+               py-chardet \
+               py-cparser \
+               py-cryptography \
+               py-dateutil \
+               py-enum34 \
+               py-idna \
+               py-ipaddress \
+               py-jinja2 \
+               py-lxml \
+               py-mysqldb \
+               py-openssl \
+               py-pip \
+               py-requests \
+               py-setuptools \
+               python \
+               python-dev && \
     apk -U add --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ \
-            py-beautifulsoup4 php7 php7-dev py-cssselect py-gevent py-greenlet py-mongo \
-            py-sqlalchemy py-webob && \
+               py-beautifulsoup4 \
+               php7 \
+               php7-dev \
+               py-cssselect \
+               py-gevent \
+               py-greenlet \
+               py-mongo \
+               py-sqlalchemy \
+               py-webob && \
 
 # Install php sandbox from git
-    git clone https://github.com/glastopf/BFR.git /opt/BFR && \
+    git clone https://github.com/mushorg/BFR /opt/BFR && \
     cd /opt/BFR && \
+    git checkout 508729202428a35bcc6bb27dd97b831f7e5009b5 && \
     phpize7 && \
     ./configure \
       --with-php-config=/usr/bin/php-config7 \
@@ -30,9 +60,14 @@ RUN apk -U upgrade && \
 # Install glastopf from git
     git clone https://github.com/mushorg/glastopf.git /opt/glastopf && \
     cd /opt/glastopf && \
+    git checkout c4932d9cb513d284142e2c0d66284221201d7477 && \
+    cp /root/dist/base_logger.py /opt/glastopf/glastopf/modules/reporting/auxiliary/ && \
+    cp /root/dist/log_s3.py /opt/glastopf/glastopf/modules/reporting/auxiliary/ && \
+    cp /root/dist/requirements.txt /opt/glastopf/ && \
     python setup.py install && \
     cd / && \
     rm -rf /opt/glastopf /tmp/* /var/tmp/* && \
+    setcap cap_net_bind_service=+ep /usr/bin/glastopf-runner && \
 
 # Setup user, groups and configs
     addgroup -g 2000 glastopf && \
@@ -41,7 +76,12 @@ RUN apk -U upgrade && \
     mv /root/dist/glastopf.cfg /opt/glastopf/ && \
 
 # Clean up
-    apk del autoconf build-base git libffi-dev php7-dev python-dev && \
+    apk del autoconf \
+            build-base \
+            git \
+            libffi-dev \
+            php7-dev \
+            python-dev && \
     rm -rf /root/* && \
     rm -rf /var/cache/apk/*