Fix tests and build issues

* Readd python for rpl * Fix tests
webdevops · Mar 28, 2017 · 0c68574 · 0c68574
1 parent 065056f
commit 0c68574
Show file tree

Hide file tree

Showing 41 changed files with 198 additions and 76 deletions.
diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile
@@ -39,6 +39,7 @@ RUN /usr/local/bin/apk-install \
 # Install services
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/apk-install \
+        python \
         supervisor \
         syslog-ng \
         wget \

diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile
@@ -39,6 +39,7 @@ RUN /usr/local/bin/yum-install \
 # Install services
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/yum-install \
+        python \
         cronie \
         supervisor \
         syslog-ng \

diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile
@@ -41,6 +41,7 @@ RUN /usr/local/bin/apt-install \
 # Install packages
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/apt-install \
+        python-minimal \
         supervisor \
         syslog-ng \
         syslog-ng-core \

diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile
@@ -41,6 +41,7 @@ RUN /usr/local/bin/apt-install \
 # Install packages
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/apt-install \
+        python-minimal \
         supervisor \
         syslog-ng \
         syslog-ng-core \

diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile
@@ -41,6 +41,7 @@ RUN /usr/local/bin/apt-install \
 # Install packages
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/apt-install \
+        python-minimal \
         supervisor \
         syslog-ng \
         syslog-ng-core \

diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile
@@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \
 # Install services
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/apt-install \
+        python-minimal \
         supervisor \
         syslog-ng \
         syslog-ng-core \

diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile
@@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \
 # Install services
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/apt-install \
+        python-minimal \
         supervisor \
         syslog-ng \
         syslog-ng-core \

diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile
@@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \
 # Install services
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/apt-install \
+        python-minimal \
         supervisor \
         syslog-ng \
         syslog-ng-core \

diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile
@@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \
 # Install services
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/apt-install \
+        python-minimal \
         supervisor \
         syslog-ng \
         syslog-ng-core \

diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile
@@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \
 # Install services
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/apt-install \
+        python-minimal \
         supervisor \
         syslog-ng \
         syslog-ng-core \

diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile
@@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \
 # Install services
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/apt-install \
+        python-minimal \
         supervisor \
         syslog-ng \
         syslog-ng-core \

diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile
@@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8"
 
 ADD baselayout.tar /
 
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     # Fix root terminal
     && echo "export TERM=xterm" >> /root/.bashrc \

diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile
@@ -16,13 +16,12 @@ ENV LC_ALL "en_US.UTF-8"
 
 ADD baselayout.tar /
 
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     # Fix root terminal
     && echo "export TERM=xterm" >> /root/.bashrc \
     # System update
     && /usr/local/bin/yum-upgrade \
-    # Install ansible
     && /usr/local/bin/yum-install \
         epel-release \
     && /usr/local/bin/generate-dockerimage-info \

diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile
@@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8"
 
 ADD baselayout.tar /
 
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     # Fix root terminal
     && echo "export TERM=xterm" >> /root/.bashrc \

diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile
@@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8"
 
 ADD baselayout.tar /
 
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     # Fix root terminal
     && echo "export TERM=xterm" >> /root/.bashrc \

diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile
@@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8"
 
 ADD baselayout.tar /
 
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     # Fix root terminal
     && echo "export TERM=xterm" >> /root/.bashrc \

diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile
@@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8"
 
 ADD baselayout.tar /
 
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     # Add multiverse
     && echo "deb http://archive.ubuntu.com/ubuntu/ precise-security multiverse" >> /etc/apt/sources.list \

diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile
@@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8"
 
 ADD baselayout.tar /
 
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     && apt-update \
     # Fix root terminal

diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile
@@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8"
 
 ADD baselayout.tar /
 
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     && apt-update \
     # Fix root terminal

diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile
@@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8"
 
 ADD baselayout.tar /
 
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     && apt-update \
     # Fix root terminal

diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile
@@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8"
 
 ADD baselayout.tar /
 
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     && apt-update \
     # Fix root terminal

diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile
@@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8"
 
 ADD baselayout.tar /
 
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     && apt-update \
     # Fix root terminal

diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile
@@ -14,5 +14,11 @@ VOLUME /etc/letsencrypt
 VOLUME /var/www
 
 RUN /usr/local/bin/apk-install \
+        python \
+        py-crypto \
+        py2-pip \
         certbot \
-    && pip install pyRFC3339 configobj ConfigArgParse
+    && pip install --upgrade pip \
+    && hash -r \
+    && pip install pyRFC3339 configobj ConfigArgParse \
+    && /usr/local/bin/docker-image-cleanup
diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile
@@ -21,7 +21,7 @@ ENV LC_ALL "en_US.UTF-8"
 
 ADD baselayout.tar /
 
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     # Fix root terminal
     && echo "export TERM=xterm" >> /root/.bashrc \
@@ -63,9 +63,34 @@ ENV DOCKER_CONF_HOME /opt/docker/
 
 COPY conf/ /opt/docker/
 
+# Install ansible
+RUN /usr/local/bin/apt-install \
+        # Install ansible
+        python-minimal \
+        python-setuptools \
+        python-pip \
+        python-paramiko \
+        python-jinja2 \
+        python-dev \
+        libffi-dev \
+        libssl-dev \
+        build-essential \
+    && pip install --upgrade pip \
+    && hash -r \
+    && pip install --no-cache-dir ansible \
+    && chmod 750 /usr/local/bin/ansible* \
+    # Cleanup
+    && apt-get purge -y -f --force-yes \
+        python-dev \
+        build-essential \
+        libssl-dev \
+        libffi-dev \
+    && /usr/local/bin/docker-image-cleanup
+
 # Install packages
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/apt-install \
+        python-minimal \
         supervisor \
         syslog-ng \
         syslog-ng-core \

diff --git a/docker/samson-deployment/latest/Dockerfile.jinja2 b/docker/samson-deployment/latest/Dockerfile.jinja2
@@ -21,6 +21,8 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
+{{ ansible.debian() }}
+
 {{ base.debian() }}
 
 ###############################################################################

diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile
@@ -11,6 +11,10 @@ LABEL io.webdevops.layout=8
 LABEL io.webdevops.version=1.5.0
 
 RUN /usr/local/bin/apk-install \
+    # General python
+    python \
+    py-crypto \
+    py2-pip \
     # General sphinx
     py-pillow \
     py-yaml \
@@ -19,6 +23,8 @@ RUN /usr/local/bin/apk-install \
     # GRAPHVIZ
     graphviz \
     ttf-dejavu \
+    && pip install --upgrade pip \
+    && hash -r \
     && pip install --upgrade sphinxcontrib-googlechart \
     && pip install --upgrade sphinxcontrib-googlemaps \
     && pip install --upgrade sphinxcontrib-httpdomain \

diff --git a/template/Dockerfile/images/base.jinja2 b/template/Dockerfile/images/base.jinja2
@@ -5,6 +5,7 @@
 # Install services
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/apk-install \
+        python \
         supervisor \
         syslog-ng \
         wget \
@@ -21,6 +22,7 @@ RUN chmod +x /opt/docker/bin/* \
 # Install services
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/yum-install \
+        python \
         cronie \
         supervisor \
         syslog-ng \
@@ -38,6 +40,7 @@ RUN chmod +x /opt/docker/bin/* \
 # Install packages
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/apt-install \
+        python-minimal \
         supervisor \
         syslog-ng \
         syslog-ng-core \
@@ -56,6 +59,7 @@ RUN chmod +x /opt/docker/bin/* \
 # Install services
 RUN chmod +x /opt/docker/bin/* \
     && /usr/local/bin/apt-install \
+        python-minimal \
         supervisor \
         syslog-ng \
         syslog-ng-core \

diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2
@@ -1,7 +1,7 @@
 {% import 'Dockerfile/docker.jinja2' as docker %}
 
 {% macro alpine() -%}
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     # Fix root terminal
     && echo "export TERM=xterm" >> /root/.bashrc \
@@ -36,13 +36,12 @@ RUN set -x \
 
 
 {% macro centos() -%}
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     # Fix root terminal
     && echo "export TERM=xterm" >> /root/.bashrc \
     # System update
     && /usr/local/bin/yum-upgrade \
-    # Install ansible
     && /usr/local/bin/yum-install \
         epel-release \
     && /usr/local/bin/generate-dockerimage-info \
@@ -64,7 +63,7 @@ RUN set -x \
 
 
 {% macro debian(distribution) -%}
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     # Fix root terminal
     && echo "export TERM=xterm" >> /root/.bashrc \
@@ -101,7 +100,7 @@ RUN set -x \
 
 
 {% macro ubuntu12() -%}
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     # Add multiverse
     && echo "deb http://archive.ubuntu.com/ubuntu/ precise-security multiverse" >> /etc/apt/sources.list \
@@ -140,7 +139,7 @@ RUN set -x \
 
 
 {% macro ubuntu() -%}
-# Init bootstrap (and install ansible)
+# Init bootstrap
 RUN set -x \
     && apt-update \
     # Fix root terminal

diff --git a/template/Dockerfile/images/certbot.jinja2 b/template/Dockerfile/images/certbot.jinja2
@@ -8,6 +8,12 @@ ENV CERTBOT_DOMAIN  ""
 
 {% macro alpine() -%}
 RUN /usr/local/bin/apk-install \
+        python \
+        py-crypto \
+        py2-pip \
         certbot \
-    && pip install pyRFC3339 configobj ConfigArgParse
+    && pip install --upgrade pip \
+    && hash -r \
+    && pip install pyRFC3339 configobj ConfigArgParse \
+    {{ docker.cleanup() }}
 {%- endmacro %}
diff --git a/template/Dockerfile/images/sphinx.jinja2 b/template/Dockerfile/images/sphinx.jinja2
@@ -3,6 +3,10 @@
 
 {% macro alpine() -%}
 RUN /usr/local/bin/apk-install \
+    # General python
+    python \
+    py-crypto \
+    py2-pip \
     # General sphinx
     py-pillow \
     py-yaml \
@@ -11,6 +15,8 @@ RUN /usr/local/bin/apk-install \
     # GRAPHVIZ
     graphviz \
     ttf-dejavu \
+    && pip install --upgrade pip \
+    && hash -r \
     && pip install --upgrade sphinxcontrib-googlechart \
     && pip install --upgrade sphinxcontrib-googlemaps \
     && pip install --upgrade sphinxcontrib-httpdomain \