diff --git a/baselayout/usr/local/bin/apt-add-repository b/baselayout/usr/local/bin/apt-add-repository new file mode 100755 index 000000000..5e6ba6d2f --- /dev/null +++ b/baselayout/usr/local/bin/apt-add-repository @@ -0,0 +1,8 @@ +#!/bin/sh + +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +apt-install software-properties-common +add-apt-repository $@ +apt-get purge -y -f software-properties-common diff --git a/baselayout/usr/local/bin/apt-install b/baselayout/usr/local/bin/apt-install index c9db1442f..ef3f327f9 100755 --- a/baselayout/usr/local/bin/apt-install +++ b/baselayout/usr/local/bin/apt-install @@ -7,12 +7,18 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true export DEBIAN_FRONTEND=noninteractive -# Update apt cache -apt-get update +if [[ -f "/tmp/.apt-update" ]]; then + echo "Detected prefetched 'apt-get update'" + # Install packages + apt-get install -y -f --no-install-recommends $* +else + # Update apt cache + apt-get update -# Install packages -apt-get install -y -f --no-install-recommends $* + # Install packages + apt-get install -y -f --no-install-recommends $* -# Clear files (reduce snapshot size) -rm -rf /var/lib/apt/lists/* -apt-get clean -y + # Clear files (reduce snapshot size) + rm -rf /var/lib/apt/lists/* + apt-get clean -y +fi diff --git a/baselayout/usr/local/bin/apt-update b/baselayout/usr/local/bin/apt-update new file mode 100755 index 000000000..d3019cc0c --- /dev/null +++ b/baselayout/usr/local/bin/apt-update @@ -0,0 +1,9 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +apt-get update +touch /tmp/.apt-update diff --git a/baselayout/usr/local/bin/apt-upgrade b/baselayout/usr/local/bin/apt-upgrade index c92612f02..bda7c3acf 100755 --- a/baselayout/usr/local/bin/apt-upgrade +++ b/baselayout/usr/local/bin/apt-upgrade @@ -7,12 +7,18 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true export DEBIAN_FRONTEND=noninteractive -# Update apt cache -apt-get update +if [[ -f "/tmp/.apt-update" ]]; then + echo "Detected prefetched 'apt-get update'" + # Update packages + apt-get dist-upgrade -y -f +else + # Update apt cache + apt-get update -# Install packages -apt-get dist-upgrade -y -f + # Update packages + apt-get dist-upgrade -y -f -# Clear files (reduce snapshot size) -rm -rf /var/lib/apt/lists/* -apt-get clean -y + # Clear files (reduce snapshot size) + rm -rf /var/lib/apt/lists/* + apt-get clean -y +fi diff --git a/baselayout/usr/local/bin/docker-image-cleanup b/baselayout/usr/local/bin/docker-image-cleanup new file mode 100755 index 000000000..ef3c3ca9b --- /dev/null +++ b/baselayout/usr/local/bin/docker-image-cleanup @@ -0,0 +1,35 @@ +#!/bin/sh + +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +LSB_FAMILY=$(cat /etc/dockerimage_distribution_family) + +case "$LSB_FAMILY" in + Debian) + rm -f /tmp/.apt-update + apt-get autoremove -y -f + apt-get clean -y + rm -rf /var/lib/apt/lists/* + ;; + + RedHat) + yum autoremove --assumeyes + yum clean all + ;; + + Alpine) + find /var/lib/apk/ -mindepth 1 -delete + ;; + + Arch) + pacman -Sc + ;; + + *) + echo "ERROR: Distribution $LSB_FAMILY not supported" + exit 1 + ;; +esac + +find /tmp/ /var/log/ -mindepth 1 -delete diff --git a/baselayout/usr/local/bin/generate-dockerimage-info b/baselayout/usr/local/bin/generate-dockerimage-info new file mode 100755 index 000000000..40472742c --- /dev/null +++ b/baselayout/usr/local/bin/generate-dockerimage-info @@ -0,0 +1,95 @@ +#!/bin/sh + +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +LSB_FAMILY="" + +############################# +# Distribution detection +############################# + +if [ -x "/usr/bin/apt-get" ]; then + # Debian family + LSB_FAMILY="Debian" + +elif [ -x "/bin/yum" ]; then + # RedHat family + LSB_FAMILY="RedHat" + +elif [ -x "/sbin/apk" ]; then + # Alpine family + LSB_FAMILY="Alpine" + +elif [ -f "/etc/arch-release" ]; then + # Alpine family + LSB_FAMILY="Arch" + +else + # Unknown + echo "ERROR: Distribution detection failed" + exit 1 +fi + +############################# +# Install +############################# + +case "$LSB_FAMILY" in + Debian) + apt-install lsb-release + ;; + + RedHat) + yum-install redhat-lsb-core + ;; +esac + +############################# +# Set distribution information +############################# + +echo "Detected $LSB_FAMILY" +echo "$LSB_FAMILY" > /etc/dockerimage_distribution_family +echo "$LSB_FAMILY" > /etc/dockerimage_distribution + +# Create all files +touch /etc/dockerimage_distribution_version +touch /etc/dockerimage_lsb +touch /etc/dockerimage_lsb_id +touch /etc/dockerimage_lsb_id +touch /etc/dockerimage_lsb_release +touch /etc/dockerimage_lsb_codename + +# Collect distribution specific informations +case "$LSB_FAMILY" in + Debian|RedHat) + lsb_release -i -s > /etc/dockerimage_distribution + lsb_release -r -s > /etc/dockerimage_distribution_version + lsb_release -a > /etc/dockerimage_lsb + lsb_release -i -s > /etc/dockerimage_lsb_id + lsb_release -d -s > /etc/dockerimage_lsb_id + lsb_release -r -s > /etc/dockerimage_lsb_release + lsb_release -c -s > /etc/dockerimage_lsb_codename + ;; + + Alpine) + cat /etc/alpine-release > /etc/dockerimage_distribution_version + ;; +esac + + +############################# +# Uninstall +############################# + +case "$LSB_FAMILY" in + Debian) + apt-get purge -y -f lsb-release + ;; + + RedHat) + yum erase --assumeyes redhat-lsb-core + yum autoremove --assumeyes + ;; +esac diff --git a/baselayout/usr/local/bin/generate-locales b/baselayout/usr/local/bin/generate-locales index 4be4fc424..c0fcf0330 100755 --- a/baselayout/usr/local/bin/generate-locales +++ b/baselayout/usr/local/bin/generate-locales @@ -1,16 +1,18 @@ #!/bin/bash -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions +set -o pipefail ## trace ERR through pipes +set -o errtrace ## trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value +LSB_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +LSB_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) ####################################### ## Debian ####################################### -if [[ "$(lsb_release -i -s)" == "Debian" ]]; then +if [[ "$LSB_DISTRIBUTION" == "Debian" ]]; then /usr/local/bin/apt-install locales-all fi @@ -18,8 +20,8 @@ fi ## Ubuntu ####################################### -if [[ "$(lsb_release -i -s)" == "Ubuntu" ]]; then - if [[ "$(lsb_release -r -s | cut -f 1 -d .)" -ge "16" ]]; then +if [[ "$LSB_DISTRIBUTION" == "Ubuntu" ]]; then + if [[ "$(echo $LSB_DISTRIBUTION_VERSION| cut -f 1 -d .)" -ge "16" ]]; then # Ubuntu 16.04 or later /usr/local/bin/apt-install locales-all else diff --git a/conf/provision.yml b/conf/provision.yml index 68465a9c2..cec30b1d7 100644 --- a/conf/provision.yml +++ b/conf/provision.yml @@ -96,6 +96,8 @@ provision: piwik: configuration: piwik/general : '*' + typo3-solr: + baselayout: on varnish: configuration: varnish/general : '*' diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine-3/Dockerfile index 68f7c0fec..f38b77eab 100644 --- a/docker/apache-dev/alpine-3/Dockerfile +++ b/docker/apache-dev/alpine-3/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index b58f2f8fe..c83a0827d 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index d14bbb456..0c282d7de 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 0f67ddaac..9c5eb294f 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index 5d31ab98a..dce5583cb 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index 517cf76d9..84ec113f9 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index 0ba61658a..0616c81be 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index a0372a283..2f933bc53 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index 3628c0008..bf3133eb5 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index 20d4e05c3..6dc96a7fd 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index 455506522..bd11775e0 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile index 946f1ae4e..6f77885c3 100644 --- a/docker/apache/alpine-3/Dockerfile +++ b/docker/apache/alpine-3/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apk-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index b00059c4c..35c3dec17 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -25,7 +25,7 @@ RUN /usr/local/bin/yum-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index d64f8cf0e..dc255d0a4 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 8bdfe34e3..5049bcbc1 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 96943087c..09261748b 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -26,7 +26,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index e99f5e41d..be6bb78d3 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers version expires \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index 566642d62..d2d6f141d 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers expires \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index 5c903a026..999b622e2 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index f29507207..fa672a170 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 5e1ae400a..1f7aba5f6 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index b6633b428..8e25002c8 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile index 22be56586..8ac31c244 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -42,5 +42,5 @@ RUN /usr/local/bin/apk-install-edge shadow \ nano \ vim \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index d3823f398..d0fe76aa2 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -43,5 +43,5 @@ RUN /usr/local/bin/yum-install \ vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 81a1d9dbc..2ea2f3080 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -43,5 +43,5 @@ RUN /usr/local/bin/apt-install \ vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 00796bfb1..577abd5e4 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -43,5 +43,5 @@ RUN /usr/local/bin/apt-install \ vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 562c1d0d2..04af72f16 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -43,5 +43,5 @@ RUN /usr/local/bin/apt-install \ vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 6643262e1..ec646eab2 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -44,5 +44,5 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index 51517afa2..6bdc87279 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -44,5 +44,5 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 8d0a88b67..8d2cbf418 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -44,5 +44,5 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 90fc6ac7a..ea2eedcc3 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -44,5 +44,5 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index 54ef72a04..70c49b03c 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -44,5 +44,5 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index 0f3b005ba..b45b98834 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -44,5 +44,5 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index a4c28357f..3b9f33992 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -19,15 +19,14 @@ RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apk-install \ supervisor \ syslog-ng \ - logrotate \ wget \ curl \ sed \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/alpine-3/conf/bin/provision b/docker/base/alpine-3/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/alpine-3/conf/bin/provision +++ b/docker/base/alpine-3/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/alpine-3/conf/provision/variables-webdevops.yml b/docker/base/alpine-3/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/alpine-3/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/alpine-3/conf/provision/variables.yml b/docker/base/alpine-3/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/alpine-3/conf/provision/variables.yml +++ b/docker/base/alpine-3/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 7259b65e2..ea9a88438 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -20,15 +20,14 @@ RUN chmod +x /opt/docker/bin/* \ cronie \ supervisor \ syslog-ng \ - logrotate \ wget \ curl \ net-tools \ gnupg2 \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/centos-7/conf/bin/provision b/docker/base/centos-7/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/centos-7/conf/bin/provision +++ b/docker/base/centos-7/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/centos-7/conf/provision/variables-webdevops.yml b/docker/base/centos-7/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/centos-7/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/centos-7/conf/provision/variables.yml b/docker/base/centos-7/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/centos-7/conf/provision/variables.yml +++ b/docker/base/centos-7/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index f064df54a..dfdcd4a6b 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/debian-7/conf/bin/provision b/docker/base/debian-7/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/debian-7/conf/bin/provision +++ b/docker/base/debian-7/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/debian-7/conf/provision/variables-webdevops.yml b/docker/base/debian-7/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/debian-7/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/debian-7/conf/provision/variables.yml b/docker/base/debian-7/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/debian-7/conf/provision/variables.yml +++ b/docker/base/debian-7/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 9249ec988..2b5fff13f 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/debian-8/conf/bin/provision b/docker/base/debian-8/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/debian-8/conf/bin/provision +++ b/docker/base/debian-8/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/debian-8/conf/provision/variables-webdevops.yml b/docker/base/debian-8/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/debian-8/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/debian-8/conf/provision/variables.yml b/docker/base/debian-8/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/debian-8/conf/provision/variables.yml +++ b/docker/base/debian-8/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 92592773b..60ef8fb41 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/debian-9/conf/bin/provision b/docker/base/debian-9/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/debian-9/conf/bin/provision +++ b/docker/base/debian-9/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/debian-9/conf/provision/variables-webdevops.yml b/docker/base/debian-9/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/debian-9/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/debian-9/conf/provision/variables.yml b/docker/base/debian-9/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/debian-9/conf/provision/variables.yml +++ b/docker/base/debian-9/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 87a7bda21..047b345c1 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-12.04/conf/bin/provision b/docker/base/ubuntu-12.04/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/ubuntu-12.04/conf/bin/provision +++ b/docker/base/ubuntu-12.04/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-12.04/conf/provision/variables.yml b/docker/base/ubuntu-12.04/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/ubuntu-12.04/conf/provision/variables.yml +++ b/docker/base/ubuntu-12.04/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 2f116aaef..5a9a7f185 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-14.04/conf/bin/provision b/docker/base/ubuntu-14.04/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/ubuntu-14.04/conf/bin/provision +++ b/docker/base/ubuntu-14.04/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-14.04/conf/provision/variables.yml b/docker/base/ubuntu-14.04/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/ubuntu-14.04/conf/provision/variables.yml +++ b/docker/base/ubuntu-14.04/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 4f2bc9d4e..b033bea58 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-15.04/conf/bin/provision b/docker/base/ubuntu-15.04/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/ubuntu-15.04/conf/bin/provision +++ b/docker/base/ubuntu-15.04/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-15.04/conf/provision/variables.yml b/docker/base/ubuntu-15.04/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/ubuntu-15.04/conf/provision/variables.yml +++ b/docker/base/ubuntu-15.04/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index db758edc7..cbda949c0 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-15.10/conf/bin/provision b/docker/base/ubuntu-15.10/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/ubuntu-15.10/conf/bin/provision +++ b/docker/base/ubuntu-15.10/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-15.10/conf/provision/variables.yml b/docker/base/ubuntu-15.10/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/ubuntu-15.10/conf/provision/variables.yml +++ b/docker/base/ubuntu-15.10/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 4e9ac241d..53eee2dbe 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-16.04/conf/bin/provision b/docker/base/ubuntu-16.04/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/ubuntu-16.04/conf/bin/provision +++ b/docker/base/ubuntu-16.04/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-16.04/conf/provision/variables.yml b/docker/base/ubuntu-16.04/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/ubuntu-16.04/conf/provision/variables.yml +++ b/docker/base/ubuntu-16.04/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 3ac259f01..bfa7158cf 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-16.10/conf/bin/provision b/docker/base/ubuntu-16.10/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/ubuntu-16.10/conf/bin/provision +++ b/docker/base/ubuntu-16.10/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-16.10/conf/provision/variables.yml b/docker/base/ubuntu-16.10/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/ubuntu-16.10/conf/provision/variables.yml +++ b/docker/base/ubuntu-16.10/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 9ef3433c3..5377c10bc 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ && /usr/local/bin/apk-install \ bash \ ca-certificates \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apk-install \ python \ @@ -64,4 +65,4 @@ RUN set -x \ && apk del .gosu-deps \ # Cleanup && apk del python-dev \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/alpine-3/baselayout.tar b/docker/bootstrap/alpine-3/baselayout.tar index 9fe660194..dcac04c19 100644 Binary files a/docker/bootstrap/alpine-3/baselayout.tar and b/docker/bootstrap/alpine-3/baselayout.tar differ diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 61ae28f57..c84dff97d 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -35,6 +35,7 @@ RUN set -x \ libffi \ python-devel \ libffi-devel \ + && /usr/local/bin/generate-dockerimage-info \ && easy_install pip \ && pip install --upgrade pip \ && hash -r \ @@ -55,5 +56,4 @@ RUN set -x \ && yum erase -y wget \ # Cleanup && yum erase -y python-devel \ - && yum clean all \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/centos-7/baselayout.tar b/docker/bootstrap/centos-7/baselayout.tar index 9fe660194..dcac04c19 100644 Binary files a/docker/bootstrap/centos-7/baselayout.tar and b/docker/bootstrap/centos-7/baselayout.tar differ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 1ff5c39be..677df3450 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -17,20 +17,21 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri 's/(deb.*\/debian wheezy main)/\1 contrib non-free /' -- /etc/apt/sources.list \ - # System updatei + && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && apt-update \ + # System update && /usr/local/bin/apt-upgrade \ # Base stuff && /usr/local/bin/apt-install \ - lsb-release \ + apt-transport-https \ ca-certificates \ locales \ - apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ @@ -68,6 +69,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-7/baselayout.tar b/docker/bootstrap/debian-7/baselayout.tar index 9fe660194..dcac04c19 100644 Binary files a/docker/bootstrap/debian-7/baselayout.tar and b/docker/bootstrap/debian-7/baselayout.tar differ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 177a66737..8c20becfe 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -17,20 +17,21 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri 's/(deb.*\/debian jessie main)/\1 contrib non-free /' -- /etc/apt/sources.list \ - # System updatei + && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && apt-update \ + # System update && /usr/local/bin/apt-upgrade \ # Base stuff && /usr/local/bin/apt-install \ - lsb-release \ + apt-transport-https \ ca-certificates \ locales \ - apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ @@ -68,6 +69,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-8/baselayout.tar b/docker/bootstrap/debian-8/baselayout.tar index 9fe660194..dcac04c19 100644 Binary files a/docker/bootstrap/debian-8/baselayout.tar and b/docker/bootstrap/debian-8/baselayout.tar differ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 2d315e158..4b193173e 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -17,20 +17,21 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri 's/(deb.*\/debian stretch main)/\1 contrib non-free /' -- /etc/apt/sources.list \ - # System updatei + && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && apt-update \ + # System update && /usr/local/bin/apt-upgrade \ # Base stuff && /usr/local/bin/apt-install \ - lsb-release \ + apt-transport-https \ ca-certificates \ locales \ - apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ @@ -68,6 +69,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-9/baselayout.tar b/docker/bootstrap/debian-9/baselayout.tar index 9fe660194..dcac04c19 100644 Binary files a/docker/bootstrap/debian-9/baselayout.tar and b/docker/bootstrap/debian-9/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 8491cd490..aaa87307d 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -17,13 +17,13 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ # Add multiverse && echo "deb http://archive.ubuntu.com/ubuntu/ precise-security multiverse" >> /etc/apt/sources.list \ && echo "deb-src http://archive.ubuntu.com/ubuntu/ precise-security multiverse" >> /etc/apt/sources.list \ && echo "deb http://archive.ubuntu.com/ubuntu/ precise multiverse" >> /etc/apt/sources.list \ && echo "deb-src http://archive.ubuntu.com/ubuntu/ precise multiverse" >> /etc/apt/sources.list \ + && apt-update \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ # Generate base locale @@ -32,8 +32,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ + apt-transport-https \ python-software-properties \ - lsb-release \ ca-certificates \ # Install ansible python-minimal \ @@ -46,6 +46,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ libssl-dev \ build-essential \ apt-transport-https \ + && /usr/local/bin/generate-dockerimage-info \ && pip install --upgrade pip \ && hash -r \ && pip install ansible \ @@ -69,6 +70,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-12.04/baselayout.tar b/docker/bootstrap/ubuntu-12.04/baselayout.tar index 9fe660194..dcac04c19 100644 Binary files a/docker/bootstrap/ubuntu-12.04/baselayout.tar and b/docker/bootstrap/ubuntu-12.04/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 54f7edd07..66608ddbd 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -17,8 +17,8 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ + && apt-update \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ # Generate base locale @@ -27,11 +27,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ - software-properties-common \ - lsb-release \ ca-certificates \ apt-transport-https \ && apt-add-repository multiverse \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apt-install \ python-minimal \ @@ -67,6 +67,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-14.04/baselayout.tar b/docker/bootstrap/ubuntu-14.04/baselayout.tar index 9fe660194..dcac04c19 100644 Binary files a/docker/bootstrap/ubuntu-14.04/baselayout.tar and b/docker/bootstrap/ubuntu-14.04/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 355bb5bcb..cee479bbb 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -17,8 +17,8 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ + && apt-update \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ # Generate base locale @@ -27,11 +27,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ - software-properties-common \ - lsb-release \ ca-certificates \ apt-transport-https \ && apt-add-repository multiverse \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apt-install \ python-minimal \ @@ -67,6 +67,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.04/baselayout.tar b/docker/bootstrap/ubuntu-15.04/baselayout.tar index 9fe660194..dcac04c19 100644 Binary files a/docker/bootstrap/ubuntu-15.04/baselayout.tar and b/docker/bootstrap/ubuntu-15.04/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 5dead43df..4675cbf80 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -17,8 +17,8 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ + && apt-update \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ # Generate base locale @@ -27,11 +27,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ - software-properties-common \ - lsb-release \ ca-certificates \ apt-transport-https \ && apt-add-repository multiverse \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apt-install \ python-minimal \ @@ -67,6 +67,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.10/baselayout.tar b/docker/bootstrap/ubuntu-15.10/baselayout.tar index 9fe660194..dcac04c19 100644 Binary files a/docker/bootstrap/ubuntu-15.10/baselayout.tar and b/docker/bootstrap/ubuntu-15.10/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index e518088a8..f24310c1c 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -17,8 +17,8 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ + && apt-update \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ # Generate base locale @@ -27,11 +27,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ - software-properties-common \ - lsb-release \ ca-certificates \ apt-transport-https \ && apt-add-repository multiverse \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apt-install \ python-minimal \ @@ -67,6 +67,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.04/baselayout.tar b/docker/bootstrap/ubuntu-16.04/baselayout.tar index 9fe660194..dcac04c19 100644 Binary files a/docker/bootstrap/ubuntu-16.04/baselayout.tar and b/docker/bootstrap/ubuntu-16.04/baselayout.tar differ diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 9685cbbd4..f653acd08 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -17,8 +17,8 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ + && apt-update \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ # Generate base locale @@ -27,11 +27,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ - software-properties-common \ - lsb-release \ ca-certificates \ apt-transport-https \ && apt-add-repository multiverse \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apt-install \ python-minimal \ @@ -67,6 +67,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.10/baselayout.tar b/docker/bootstrap/ubuntu-16.10/baselayout.tar index 9fe660194..dcac04c19 100644 Binary files a/docker/bootstrap/ubuntu-16.10/baselayout.tar and b/docker/bootstrap/ubuntu-16.10/baselayout.tar differ diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile b/docker/hhvm-apache/ubuntu-14.04/Dockerfile index 2d29e8db7..ab80cb618 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile @@ -30,7 +30,7 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers expires \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-hhvm-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/hhvm-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/hhvm-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/hhvm-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/hhvm-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/hhvm-apache/ubuntu-16.04/Dockerfile b/docker/hhvm-apache/ubuntu-16.04/Dockerfile index c00235337..e8476bdb9 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-hhvm-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/hhvm-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/hhvm-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/hhvm-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/hhvm-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile index e552cd6f2..d09412e65 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-hhvm-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile index 7e6b49afe..30c3e0ea2 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-hhvm-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile index 05d77cc54..88b3ca7d2 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile +++ b/docker/hhvm/ubuntu-14.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install hhvm environment RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449 \ - && add-apt-repository "deb http://dl.hhvm.com/ubuntu $(lsb_release -sc) main" \ + && echo "deb http://dl.hhvm.com/ubuntu $(cat /etc/dockerimage_lsb_codename) main" >> /etc/apt/sources.list \ && /usr/local/bin/apt-install \ hhvm \ imagemagick \ @@ -28,8 +28,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && /usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-hhvm \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile b/docker/hhvm/ubuntu-16.04/Dockerfile index 924bd367f..bd6c95cd8 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile +++ b/docker/hhvm/ubuntu-16.04/Dockerfile @@ -25,8 +25,8 @@ RUN /usr/local/bin/apt-install \ && /usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-hhvm \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index cff102307..87babffe6 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -23,8 +23,8 @@ RUN /usr/local/bin/apt-install \ && /opt/docker/bin/control.sh service.enable dovecot \ && /opt/docker/bin/provision add --tag entrypoint webdevops-mail-sandbox \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-mail-sandbox \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup # Install Roundcube + plugins RUN cd /app \ @@ -35,6 +35,7 @@ RUN cd /app \ && ls -l \ && rm -rf .git installer \ && ln -s /opt/docker/etc/roundcube/plugins/webdevops_autologin/ plugins/webdevops_autologin \ - && ln -s /opt/docker/etc/roundcube/config.php config/config.inc.php + && ln -s /opt/docker/etc/roundcube/config.php config/config.inc.php \ + && /usr/local/bin/docker-image-cleanup EXPOSE 25 465 587 143 993 diff --git a/docker/nginx-dev/alpine-3/Dockerfile b/docker/nginx-dev/alpine-3/Dockerfile index f82567674..ccf7cb8cb 100644 --- a/docker/nginx-dev/alpine-3/Dockerfile +++ b/docker/nginx-dev/alpine-3/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index eb22a35e8..98c8939fe 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index bc11cf563..362afb3bc 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index 9688f8538..a06c9106a 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index 495e4dec3..36fcd71f8 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index 09867db38..6eb5946db 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index 47523ef4e..b1b76f0b9 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index 00e18b89d..4bd650376 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index 45aae883c..83e79659a 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index 1f5151cb4..33bb72605 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile b/docker/nginx-dev/ubuntu-16.10/Dockerfile index 0ecd1a20f..24a0847a6 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/alpine-3/Dockerfile b/docker/nginx/alpine-3/Dockerfile index 1040faa2f..2192d6eab 100644 --- a/docker/nginx/alpine-3/Dockerfile +++ b/docker/nginx/alpine-3/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index be7e92ab5..7badb5dd9 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 7e26d64c2..971603984 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index 4cbf5ab38..a96a68473 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index 9f3ffde21..9b566585e 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 9aad4af44..1dde487d5 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 29d85d0ec..cbc7985b2 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index 791a4b134..bab53f52f 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 732ce20d3..9f0373356 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 7295a41b9..2d64fba27 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index ad78b5abe..38ffd1165 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile index 6402fdb1b..f8f344637 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apk-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/alpine-3/Dockerfile b/docker/php-apache-dev/alpine-3/Dockerfile index 2dc02048a..3d68a1ef9 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile +++ b/docker/php-apache-dev/alpine-3/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apk-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index 55ed16b85..ed65c9abb 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/yum-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile b/docker/php-apache-dev/centos-7-php7/Dockerfile index 74293f318..621ada4ad 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/yum-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index 924a5eb8e..ec6da56e9 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/yum-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index bea517d44..15e2a1a21 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -30,7 +30,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index d0b64dc51..885fab26d 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index f868ae6fc..db604dc57 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index 75424fa23..336cc0267 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index 2aa66f626..d741be206 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -31,7 +31,7 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers version expires \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index 3c8485a59..888b88fb8 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -31,7 +31,7 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers expires \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index c61432ba9..d9d0ca115 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index f6f57b629..b9c946690 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index fdd141b42..b7d07e2dc 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile b/docker/php-apache-dev/ubuntu-16.10/Dockerfile index 40c437508..66d1454ba 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache/alpine-3-php7/Dockerfile b/docker/php-apache/alpine-3-php7/Dockerfile index 693dbec9b..cdbd1198a 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile +++ b/docker/php-apache/alpine-3-php7/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apk-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/alpine-3/Dockerfile b/docker/php-apache/alpine-3/Dockerfile index 499a227a5..ca72f0f92 100644 --- a/docker/php-apache/alpine-3/Dockerfile +++ b/docker/php-apache/alpine-3/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apk-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index e32a5eef5..e33426a94 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -26,7 +26,7 @@ RUN /usr/local/bin/yum-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/centos-7-php56/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index 85f333a48..4a15597b8 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -26,7 +26,7 @@ RUN /usr/local/bin/yum-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index bd5d5b4c6..472d779f6 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -26,7 +26,7 @@ RUN /usr/local/bin/yum-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 7773eb024..a981e9662 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index b3fff5338..f68edccdc 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 0123662f7..9e2953ac0 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index 73d422bac..55997ea71 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index 3a5ac53b2..231ec2076 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -30,7 +30,7 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers version expires \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 77a9c5504..3de008a16 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -30,7 +30,7 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers expires \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index c0fdee1f3..b3a3f9003 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index b39e469a5..fc759ae00 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index 884ebf8cf..eadc17829 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index 1ace16150..4886a5901 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile index 40412dea2..69189b9ce 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -19,5 +19,5 @@ RUN /usr/local/bin/apk-install \ # Install php development stuff php7-xdebug \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index 0ca5b4565..f7815ec2f 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -19,5 +19,5 @@ RUN /usr/local/bin/apk-install \ # Install php development stuff php5-xdebug \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 91d83c541..2d4d84b90 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -21,5 +21,5 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index ea12d38d4..f7d659988 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -21,5 +21,5 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 6d9787d0e..ed021f841 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -22,5 +22,5 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 51661fbcc..d4ea34821 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index fc369c00a..a6df9d226 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 6c077d718..1ae296973 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 9bbf28516..7f1daae72 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 7f1578b13..f73d8e1d0 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index a92222480..d7e2d5712 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index a130d6bab..240f389f5 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 2ec19de44..3c5cf2908 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index ad3e1edc9..6d574de82 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index 3d3752800..ad3e305e9 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-3-php7/Dockerfile index 4e8a1d541..d5a80944a 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine-3/Dockerfile index 5dfa6dd86..61ddfd189 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile +++ b/docker/php-nginx-dev/alpine-3/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index a7daf26f2..5e8a2f3a6 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile b/docker/php-nginx-dev/centos-7-php7/Dockerfile index e8fe8d959..374e42c73 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index 314777eba..d9fd15163 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 2a4679085..c45ec363c 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 0901bdd5d..0dfe1d206 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index 05da8876d..59fc64054 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index ddc584031..cd70a168f 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index 359650c2a..c4ec7a6e4 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index 5d3fb3f0c..fa82cd0b4 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 1359c2a3c..40a7d7e33 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index 65bd93ede..1db5a3a42 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index 8ea4bab8e..5fea027b5 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile index 12ce1c9a9..9c7be2872 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-3-php7/Dockerfile index e101f74c8..7987463a6 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile +++ b/docker/php-nginx/alpine-3-php7/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/alpine-3/Dockerfile b/docker/php-nginx/alpine-3/Dockerfile index 604bf6177..9395cac2a 100644 --- a/docker/php-nginx/alpine-3/Dockerfile +++ b/docker/php-nginx/alpine-3/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index d26ed0350..8aa9e0dee 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index 6a549ea5b..7e3753f98 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 3b6c5c51a..5d7ed728e 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 8e6efc623..34025e104 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index c8d6e1539..a0a00ff16 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 7e449ef3c..47f6ad73c 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index f578b3972..2b1f980ac 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index c48274f8c..fb0305574 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 6172a41b5..63037e69d 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index a30ca71ac..67106e006 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index 17e4b66ab..d116c1b9c 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index bd1934b68..6e528982d 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index f10b080db..3bfa7fbd7 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index 43adcaa97..22b0a1428 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -78,7 +78,7 @@ RUN /usr/local/bin/apk-install \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile index 3db15f23b..7fc09173f 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -73,7 +73,7 @@ RUN /usr/local/bin/apk-install \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index f5422aeff..2cba1c770 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -53,9 +53,8 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Cleanup && yum erase -y php-devel gcc \ - && yum clean all \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index 6b8cde054..ba5fb576d 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -61,7 +61,7 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && echo "extension=redis.so" > /etc/php.d/redis.ini \ && yum remove -y ImageMagick-devel php70w-devel gcc make \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index a6a12590b..b00393749 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -57,9 +57,8 @@ RUN /usr/local/bin/yum-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Cleanup && yum erase -y php-devel gcc \ - && yum clean all \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index efb4d49c3..75c17ec70 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -47,7 +47,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 48a8a215c..9d237a0e1 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -58,7 +58,7 @@ RUN /usr/local/bin/apt-install apt-transport-https lsb-release \ php-apcu \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 142fd95b3..e89050d6a 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -49,7 +49,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index 570de67be..fc85e8143 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -47,7 +47,7 @@ RUN /usr/local/bin/apt-install \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index eda86919f..c9f7e28e9 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -48,7 +48,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 48b66770a..52c63a949 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -49,7 +49,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index 918037e36..4455b699b 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -49,7 +49,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index eb1b44bd5..f428d4014 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -49,7 +49,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index a0d3162f3..107df430f 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -46,7 +46,7 @@ RUN /usr/local/bin/apt-install \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index 15e960fe9..7c76f4841 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -46,7 +46,7 @@ RUN /usr/local/bin/apt-install \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index ad9f8a153..9946622ad 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -14,7 +14,7 @@ COPY conf/ /opt/docker/ RUN /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-postfix \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 25 465 587 diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 7b7203de6..019ecd062 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -22,20 +22,21 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri 's/(deb.*\/debian jessie main)/\1 contrib non-free /' -- /etc/apt/sources.list \ - # System updatei + && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && apt-update \ + # System update && /usr/local/bin/apt-upgrade \ # Base stuff && /usr/local/bin/apt-install \ - lsb-release \ + apt-transport-https \ ca-certificates \ locales \ - apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ @@ -73,9 +74,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup ############################################################################### # Base @@ -91,7 +90,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -99,8 +97,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ############################################################################### # Base-app @@ -137,8 +135,8 @@ RUN /usr/local/bin/apt-install \ vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ############################################################################### # Samson @@ -173,7 +171,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ python-dotenv \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ ## Enable ansible for deployment user - && chmod 755 /usr/local/bin/ansible* + && chmod 755 /usr/local/bin/ansible* \ + && /usr/local/bin/docker-image-cleanup # NPM stack RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - \ @@ -182,7 +181,8 @@ RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - \ && npm install -g gulp \ && npm install -g grunt-cli \ && npm install -g bower \ - && npm install -g npm-cache + && npm install -g npm-cache \ + && /usr/local/bin/docker-image-cleanup # Deployer stack RUN set -x \ @@ -203,7 +203,8 @@ RUN set -x \ && tar -xzf /tmp/magallanes.tar.gz -C /tmp/ \ && /tmp/magallanes/bin/mage install --installDir=/opt/magallanes \ && rm -rf /tmp/magallanes.tar.gz /tmp/magallanes/ \ - && ln -s /opt/magallanes/latest/bin/mage /usr/bin/mage + && ln -s /opt/magallanes/latest/bin/mage /usr/bin/mage \ + && /usr/local/bin/docker-image-cleanup # Upload ADD database.yml /app/config/database.yml @@ -216,7 +217,6 @@ RUN rake assets:precompile \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base --role webdevops-base-app --role webdevops-samson-deployment \ && /opt/docker/bin/bootstrap.sh - EXPOSE 80 VOLUME /storage diff --git a/docker/samson-deployment/latest/baselayout.tar b/docker/samson-deployment/latest/baselayout.tar index 9fe660194..dcac04c19 100644 Binary files a/docker/samson-deployment/latest/baselayout.tar and b/docker/samson-deployment/latest/baselayout.tar differ diff --git a/docker/samson-deployment/latest/conf/bin/provision b/docker/samson-deployment/latest/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/samson-deployment/latest/conf/bin/provision +++ b/docker/samson-deployment/latest/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/samson-deployment/latest/conf/provision/variables-webdevops.yml b/docker/samson-deployment/latest/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/samson-deployment/latest/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/samson-deployment/latest/conf/provision/variables.yml b/docker/samson-deployment/latest/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/samson-deployment/latest/conf/provision/variables.yml +++ b/docker/samson-deployment/latest/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 874b228b6..c402c2d24 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -29,4 +29,5 @@ RUN /usr/local/bin/apk-install \ && pip install t3SphinxThemeRtd \ && pip install t3fieldlisttable \ && pip install t3tablerows \ - && pip install t3targets + && pip install t3targets \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 5e512c23e..4044521d3 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -10,6 +10,7 @@ LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 -RUN /opt/docker/bin/control.sh service.enable ssh +RUN /opt/docker/bin/control.sh service.enable ssh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 22 diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 80a87d88d..a6e3f74c3 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -18,6 +18,8 @@ USER root COPY ./solr/ /tmp/solr +ADD baselayout.tar / + RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ && rm -rf /opt/solr/server \ && mv /opt/solr/example/ /opt/solr/server/ \ diff --git a/docker/typo3-solr/3.1/Dockerfile.jinja2 b/docker/typo3-solr/3.1/Dockerfile.jinja2 index 7530f5ed6..7cac98dac 100644 --- a/docker/typo3-solr/3.1/Dockerfile.jinja2 +++ b/docker/typo3-solr/3.1/Dockerfile.jinja2 @@ -8,6 +8,8 @@ USER root COPY ./solr/ /tmp/solr +{{ docker.add('baselayout.tar', '/') }} + RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ && rm -rf /opt/solr/server \ && mv /opt/solr/example/ /opt/solr/server/ \ diff --git a/docker/typo3-solr/3.1/baselayout.tar b/docker/typo3-solr/3.1/baselayout.tar new file mode 100644 index 000000000..dcac04c19 Binary files /dev/null and b/docker/typo3-solr/3.1/baselayout.tar differ diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index c70ac4ffa..3719771ae 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -18,7 +18,12 @@ USER root COPY ./solr/ /tmp/solr +ADD baselayout.tar / + +WORKDIR / + RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ + && /usr/local/bin/generate-dockerimage-info \ && rm -rf /opt/solr/server \ && mv /opt/solr/example/ /opt/solr/server/ \ && rm -rf /opt/solr/server/solr \ @@ -28,10 +33,12 @@ RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ && ln -s /opt/solr/contrib /opt/solr/server/solr/contrib \ && mkdir -p /opt/solr/server/solr/data \ && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ - && chown -R solr:solr /opt/solr/server/solr/ + && chown -R solr:solr /opt/solr/server/solr/ \ + && /usr/local/bin/docker-image-cleanup USER solr WORKDIR /opt/solr/server VOLUME ["/opt/solr/server/solr/data"] + diff --git a/docker/typo3-solr/5.0/Dockerfile.jinja2 b/docker/typo3-solr/5.0/Dockerfile.jinja2 index 7530f5ed6..6b371159a 100644 --- a/docker/typo3-solr/5.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/5.0/Dockerfile.jinja2 @@ -4,24 +4,5 @@ {{ environment.general(charset="C.UTF-8") }} -USER root +{{ typo3Solr.guywithnose(release="1.3.0") }} -COPY ./solr/ /tmp/solr - -RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ - && rm -rf /opt/solr/server \ - && mv /opt/solr/example/ /opt/solr/server/ \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/typo3lib \ - && curl -sf -o /opt/solr/server/solr/typo3lib/solr-typo3-plugin.jar -L https://github.com/TYPO3-Solr/solr-typo3-plugin/releases/download/release-1_3_0/solr-typo3-plugin-1.3.0.jar \ - && ln -s /opt/solr/contrib /opt/solr/server/solr/contrib \ - && mkdir -p /opt/solr/server/solr/data \ - && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ - && chown -R solr:solr /opt/solr/server/solr/ - -USER solr - -WORKDIR /opt/solr/server - -VOLUME ["/opt/solr/server/solr/data"] diff --git a/docker/typo3-solr/5.0/baselayout.tar b/docker/typo3-solr/5.0/baselayout.tar new file mode 100644 index 000000000..dcac04c19 Binary files /dev/null and b/docker/typo3-solr/5.0/baselayout.tar differ diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index 7b9e18545..b9df3d351 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -14,17 +14,20 @@ ENV TERM "xterm" ENV LANG "C.UTF-8" ENV LC_ALL "C.UTF-8" -COPY ./solr/ /tmp/solr - USER root -RUN apt-get update \ - && apt-get install -y -f --no-install-recommends lsb-release lsb-base net-tools \ - && apt-get clean -y \ +ADD baselayout.tar / + +COPY ./solr/ /tmp/solr + +RUN /usr/local/bin/apt-update \ + && /usr/local/bin/apt-install net-tools \ + && /usr/local/bin/generate-dockerimage-info \ && rm -rf /opt/solr/server/solr \ && mv /tmp/solr /opt/solr/server/solr \ && mkdir -p /opt/solr/server/solr/data \ - && chown -R solr:solr /opt/solr/server/solr + && chown -R solr:solr /opt/solr/server/solr \ + && /usr/local/bin/docker-image-cleanup USER solr diff --git a/docker/typo3-solr/6.0/Dockerfile.jinja2 b/docker/typo3-solr/6.0/Dockerfile.jinja2 index 4a527990f..3f257ae1d 100644 --- a/docker/typo3-solr/6.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/6.0/Dockerfile.jinja2 @@ -4,18 +4,4 @@ {{ environment.general(charset="C.UTF-8") }} -COPY ./solr/ /tmp/solr - -USER root - -RUN apt-get update \ - && apt-get install -y -f --no-install-recommends lsb-release lsb-base net-tools \ - && apt-get clean -y \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/data \ - && chown -R solr:solr /opt/solr/server/solr - -USER solr - -VOLUME ["/opt/solr/server/solr/data"] +{{ typo3Solr.official() }} diff --git a/docker/typo3-solr/6.0/baselayout.tar b/docker/typo3-solr/6.0/baselayout.tar new file mode 100644 index 000000000..dcac04c19 Binary files /dev/null and b/docker/typo3-solr/6.0/baselayout.tar differ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index f3e49864b..4dd3de6c6 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -22,7 +22,8 @@ ENV VARNISH_BACKEND_PORT "80" COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install \ - varnish + varnish \ + && /usr/local/bin/docker-image-cleanup CMD ["varnishd"] diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 109f18f82..778921412 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-install \ /var/log/supervisor \ && /opt/docker/bin/provision add --tag entrypoint webdevops-vsftp \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-vsftp \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 20 21 12020 12021 12022 12023 12024 12025 diff --git a/provisioning/apache/general/provision/roles/webdevops-apache/tasks/bootstrap.yml b/provisioning/apache/general/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/provisioning/apache/general/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/provisioning/apache/general/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and ansible_lsb.major_release|int >= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/provisioning/base/general/bin/provision b/provisioning/base/general/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/provisioning/base/general/bin/provision +++ b/provisioning/base/general/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/build/.gitkeep b/provisioning/base/general/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/build/logrotate.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/provisioning/base/general/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/provisioning/base/general/provision/variables-webdevops.yml b/provisioning/base/general/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/provisioning/base/general/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/provisioning/base/general/provision/variables.yml b/provisioning/base/general/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/provisioning/base/general/provision/variables.yml +++ b/provisioning/base/general/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 51945f90b..ec5083b95 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -41,3 +41,7 @@ ENTRYPOINT ["{{ command }}"] {%- macro cmd(command) -%} CMD ["{{ command }}"] {%- endmacro -%} + +{%- macro cleanup() -%} + && /usr/local/bin/docker-image-cleanup +{%- endmacro -%} diff --git a/template/Dockerfile/images/apache-dev.jinja2 b/template/Dockerfile/images/apache-dev.jinja2 index 31c788030..4b272d746 100644 --- a/template/Dockerfile/images/apache-dev.jinja2 +++ b/template/Dockerfile/images/apache-dev.jinja2 @@ -1,7 +1,9 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro general(role='') -%} # Install apache RUN echo \ - {{ provision.runRoleInline('apache-dev', role) }} + {{ provision.runRoleInline('apache-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/apache.jinja2 b/template/Dockerfile/images/apache.jinja2 index c1dc03abf..4e2268ef4 100644 --- a/template/Dockerfile/images/apache.jinja2 +++ b/template/Dockerfile/images/apache.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} @@ -11,7 +12,8 @@ RUN /usr/local/bin/apk-install \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -24,7 +26,8 @@ RUN /usr/local/bin/yum-install \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -40,7 +43,8 @@ RUN /usr/local/bin/apt-install \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debian8(role='') -%} @@ -54,7 +58,8 @@ RUN /usr/local/bin/apt-install \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -68,7 +73,8 @@ RUN /usr/local/bin/apt-install \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -85,7 +91,8 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers version expires \ && mkdir -p /var/lock/apache2 \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -102,7 +109,8 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ && mkdir -p /var/lock/apache2 \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -117,7 +125,8 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -132,5 +141,6 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/base.jinja2 b/template/Dockerfile/images/base.jinja2 index 1700c1ebd..1c86582fc 100644 --- a/template/Dockerfile/images/base.jinja2 +++ b/template/Dockerfile/images/base.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} @@ -6,13 +7,13 @@ RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apk-install \ supervisor \ syslog-ng \ - logrotate \ wget \ curl \ sed \ gnupg \ && chmod +s /usr/local/bin/gosu \ - {{ provision.runRoleInline('base', role) }} + {{ provision.runRoleInline('base', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -23,13 +24,13 @@ RUN chmod +x /opt/docker/bin/* \ cronie \ supervisor \ syslog-ng \ - logrotate \ wget \ curl \ net-tools \ gnupg2 \ && chmod +s /usr/local/bin/gosu \ - {{ provision.runRoleInline('base', role) }} + {{ provision.runRoleInline('base', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -40,14 +41,14 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ net-tools \ gnupg \ && chmod +s /usr/local/bin/gosu \ - {{ provision.runRoleInline('base', role) }} + {{ provision.runRoleInline('base', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -58,12 +59,12 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ net-tools \ gnupg \ && chmod +s /usr/local/bin/gosu \ - {{ provision.runRoleInline('base', role) }} + {{ provision.runRoleInline('base', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/baseapp.jinja2 b/template/Dockerfile/images/baseapp.jinja2 index 9779ffa3e..6eedc43d1 100644 --- a/template/Dockerfile/images/baseapp.jinja2 +++ b/template/Dockerfile/images/baseapp.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} @@ -24,7 +25,8 @@ RUN /usr/local/bin/apk-install-edge shadow \ git \ nano \ vim \ - {{ provision.runRoleInline('base-app', role) }} + {{ provision.runRoleInline('base-app', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -53,7 +55,8 @@ RUN /usr/local/bin/yum-install \ nano \ vim \ && /usr/local/bin/generate-locales \ - {{ provision.runRoleInline('base-app', role) }} + {{ provision.runRoleInline('base-app', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -82,7 +85,8 @@ RUN /usr/local/bin/apt-install \ nano \ vim \ && /usr/local/bin/generate-locales \ - {{ provision.runRoleInline('base-app', role) }} + {{ provision.runRoleInline('base-app', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debian9(role='') -%} @@ -110,7 +114,8 @@ RUN /usr/local/bin/apt-install \ nano \ vim \ && /usr/local/bin/generate-locales \ - {{ provision.runRoleInline('base-app', role) }} + {{ provision.runRoleInline('base-app', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro ubuntu(role='') -%} @@ -139,5 +144,6 @@ RUN /usr/local/bin/apt-install \ vim \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ - {{ provision.runRoleInline('base-app', role) }} + {{ provision.runRoleInline('base-app', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2 index 687adddc6..d735c6311 100644 --- a/template/Dockerfile/images/bootstrap.jinja2 +++ b/template/Dockerfile/images/bootstrap.jinja2 @@ -1,3 +1,5 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} + {% macro alpine() -%} # Init bootstrap (and install ansible) RUN set -x \ @@ -11,6 +13,7 @@ RUN set -x \ && /usr/local/bin/apk-install \ bash \ ca-certificates \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apk-install \ python \ @@ -47,7 +50,7 @@ RUN set -x \ && apk del .gosu-deps \ # Cleanup && apk del python-dev \ - && find /var/log/ -mindepth 1 -delete + {{ docker.cleanup() }} {%- endmacro %} @@ -72,6 +75,7 @@ RUN set -x \ libffi \ python-devel \ libffi-devel \ + && /usr/local/bin/generate-dockerimage-info \ && easy_install pip \ && pip install --upgrade pip \ && hash -r \ @@ -92,27 +96,27 @@ RUN set -x \ && yum erase -y wget \ # Cleanup && yum erase -y python-devel \ - && yum clean all \ - && find /var/log/ -mindepth 1 -delete + {{ docker.cleanup() }} {%- endmacro %} {% macro debian(distribution) -%} # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri 's/(deb.*\/debian {{ distribution }} main)/\1 contrib non-free /' -- /etc/apt/sources.list \ - # System updatei + && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && apt-update \ + # System update && /usr/local/bin/apt-upgrade \ # Base stuff && /usr/local/bin/apt-install \ - lsb-release \ + apt-transport-https \ ca-certificates \ locales \ - apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ @@ -150,21 +154,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + {{ docker.cleanup() }} {%- endmacro %} {% macro ubuntu12() -%} # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ # Add multiverse && echo "deb http://archive.ubuntu.com/ubuntu/ precise-security multiverse" >> /etc/apt/sources.list \ && echo "deb-src http://archive.ubuntu.com/ubuntu/ precise-security multiverse" >> /etc/apt/sources.list \ && echo "deb http://archive.ubuntu.com/ubuntu/ precise multiverse" >> /etc/apt/sources.list \ && echo "deb-src http://archive.ubuntu.com/ubuntu/ precise multiverse" >> /etc/apt/sources.list \ + && apt-update \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ # Generate base locale @@ -173,8 +175,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ + apt-transport-https \ python-software-properties \ - lsb-release \ ca-certificates \ # Install ansible python-minimal \ @@ -187,6 +189,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ libssl-dev \ build-essential \ apt-transport-https \ + && /usr/local/bin/generate-dockerimage-info \ && pip install --upgrade pip \ && hash -r \ && pip install ansible \ @@ -210,16 +213,14 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + {{ docker.cleanup() }} {%- endmacro %} {% macro ubuntu() -%} # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ + && apt-update \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ # Generate base locale @@ -228,11 +229,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ - software-properties-common \ - lsb-release \ ca-certificates \ apt-transport-https \ && apt-add-repository multiverse \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apt-install \ python-minimal \ @@ -268,8 +269,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/certbot.jinja2 b/template/Dockerfile/images/certbot.jinja2 index 350155d15..8c4b3eb75 100644 --- a/template/Dockerfile/images/certbot.jinja2 +++ b/template/Dockerfile/images/certbot.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro env() -%} diff --git a/template/Dockerfile/images/hhvm.jinja2 b/template/Dockerfile/images/hhvm.jinja2 index 6fd9bb196..38eac92d1 100644 --- a/template/Dockerfile/images/hhvm.jinja2 +++ b/template/Dockerfile/images/hhvm.jinja2 @@ -1,10 +1,11 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro ubuntu14(role='') -%} # Install hhvm environment RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449 \ - && add-apt-repository "deb http://dl.hhvm.com/ubuntu $(lsb_release -sc) main" \ + && echo "deb http://dl.hhvm.com/ubuntu $(cat /etc/dockerimage_lsb_codename) main" >> /etc/apt/sources.list \ && /usr/local/bin/apt-install \ hhvm \ imagemagick \ @@ -12,7 +13,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ ghostscript \ && /usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('hhvm', role) }} + {{ provision.runRoleInline('hhvm', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -25,5 +27,6 @@ RUN /usr/local/bin/apt-install \ ghostscript \ && /usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('hhvm', role) }} + {{ provision.runRoleInline('hhvm', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/liquibase.jinja2 b/template/Dockerfile/images/liquibase.jinja2 index 2940e88c8..50c2e7622 100644 --- a/template/Dockerfile/images/liquibase.jinja2 +++ b/template/Dockerfile/images/liquibase.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro mysql(role='') -%} diff --git a/template/Dockerfile/images/mail-sandbox.jinja2 b/template/Dockerfile/images/mail-sandbox.jinja2 index 62536f146..0393f04e3 100644 --- a/template/Dockerfile/images/mail-sandbox.jinja2 +++ b/template/Dockerfile/images/mail-sandbox.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro ubuntu(role='') -%} @@ -8,7 +9,8 @@ RUN /usr/local/bin/apt-install \ && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/control.sh service.enable dovecot \ && /opt/docker/bin/provision add --tag entrypoint webdevops-mail-sandbox \ - {{ provision.runRoleInline('mail-sandbox', role) }} + {{ provision.runRoleInline('mail-sandbox', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro roundcube(role='') -%} @@ -21,5 +23,6 @@ RUN cd /app \ && ls -l \ && rm -rf .git installer \ && ln -s /opt/docker/etc/roundcube/plugins/webdevops_autologin/ plugins/webdevops_autologin \ - && ln -s /opt/docker/etc/roundcube/config.php config/config.inc.php + && ln -s /opt/docker/etc/roundcube/config.php config/config.inc.php \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/nginx-dev.jinja2 b/template/Dockerfile/images/nginx-dev.jinja2 index 4c92aa67e..aed2d3400 100644 --- a/template/Dockerfile/images/nginx-dev.jinja2 +++ b/template/Dockerfile/images/nginx-dev.jinja2 @@ -1,7 +1,9 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro general(role='') -%} # Install apache RUN echo \ - {{ provision.runRoleInline('nginx-dev', role) }} + {{ provision.runRoleInline('nginx-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/nginx.jinja2 b/template/Dockerfile/images/nginx.jinja2 index 81e1b6956..a81c5cdbd 100644 --- a/template/Dockerfile/images/nginx.jinja2 +++ b/template/Dockerfile/images/nginx.jinja2 @@ -1,10 +1,12 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} # Install nginx RUN /usr/local/bin/apk-install \ nginx \ - {{ provision.runRoleInline('nginx', role) }} + {{ provision.runRoleInline('nginx', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -12,7 +14,8 @@ RUN /usr/local/bin/apk-install \ # Install tools RUN /usr/local/bin/yum-install \ nginx \ - {{ provision.runRoleInline('nginx', role) }} + {{ provision.runRoleInline('nginx', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -20,7 +23,8 @@ RUN /usr/local/bin/yum-install \ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - {{ provision.runRoleInline('nginx', role) }} + {{ provision.runRoleInline('nginx', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -28,5 +32,6 @@ RUN /usr/local/bin/apt-install \ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - {{ provision.runRoleInline('nginx', role) }} + {{ provision.runRoleInline('nginx', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/php5-dev.jinja2 b/template/Dockerfile/images/php5-dev.jinja2 index ee3892e03..2f8f0bf89 100644 --- a/template/Dockerfile/images/php5-dev.jinja2 +++ b/template/Dockerfile/images/php5-dev.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} @@ -7,7 +8,8 @@ RUN /usr/local/bin/apk-install \ graphviz \ # Install php development stuff php5-xdebug \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -21,7 +23,8 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php-pecl-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro webtatic(role='') -%} @@ -33,7 +36,8 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php56w-pecl-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debian(role='') -%} @@ -47,7 +51,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -62,5 +67,6 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/php5.jinja2 b/template/Dockerfile/images/php5.jinja2 index e57c491dc..7dad0c04b 100644 --- a/template/Dockerfile/images/php5.jinja2 +++ b/template/Dockerfile/images/php5.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} @@ -57,7 +58,8 @@ RUN /usr/local/bin/apk-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -103,8 +105,8 @@ RUN /usr/local/bin/yum-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Cleanup && yum erase -y php-devel gcc \ - && yum clean all \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro centosWebtatic(role='') -%} @@ -145,8 +147,8 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Cleanup && yum erase -y php-devel gcc \ - && yum clean all \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debian7(role='') -%} @@ -180,7 +182,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -217,7 +220,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -253,7 +257,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro ubuntu12(role='') -%} @@ -288,7 +293,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -325,7 +331,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro ubuntu16(role='') -%} @@ -355,6 +362,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/php7-dev.jinja2 b/template/Dockerfile/images/php7-dev.jinja2 index 7acf1dcb4..4be519031 100644 --- a/template/Dockerfile/images/php7-dev.jinja2 +++ b/template/Dockerfile/images/php7-dev.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} @@ -7,7 +8,8 @@ RUN /usr/local/bin/apk-install \ graphviz \ # Install php development stuff php7-xdebug \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -21,7 +23,8 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php7-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro webtatic(role='') -%} @@ -33,7 +36,8 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php70w-pecl-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debian(role='') -%} @@ -47,7 +51,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debianDotDeb(role='') -%} @@ -61,7 +66,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php7.0-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debianSury(role='') -%} @@ -75,7 +81,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ # php7.0-xdebug \ # Is currently not available blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro ubuntu(role='') -%} @@ -89,5 +96,6 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/php7.jinja2 b/template/Dockerfile/images/php7.jinja2 index e1782e5f2..ec3f29198 100644 --- a/template/Dockerfile/images/php7.jinja2 +++ b/template/Dockerfile/images/php7.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} @@ -62,7 +63,8 @@ RUN /usr/local/bin/apk-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debianDotDeb(distribution,role='') -%} @@ -94,7 +96,8 @@ RUN echo "deb http://packages.dotdeb.org {{ distribution }} all" >> /etc/apt/sou php7.0-memcached \ php-apcu \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debianSury(distribution,role='') -%} @@ -139,7 +142,8 @@ RUN /usr/local/bin/apt-install apt-transport-https lsb-release \ php7.0-mbstring \ php-apcu \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debian9(role='') -%} @@ -173,7 +177,8 @@ RUN /usr/local/bin/apt-install \ php-memcache \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro ubuntu(role='') -%} @@ -206,7 +211,8 @@ RUN /usr/local/bin/apt-install \ php-redis \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro centosWebtatic(role='') -%} @@ -254,5 +260,6 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && rm -rf /tmp/* \ && echo "extension=redis.so" > /etc/php.d/redis.ini \ && yum remove -y ImageMagick-devel php70w-devel gcc make \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/postfix.jinja2 b/template/Dockerfile/images/postfix.jinja2 index 215afde6b..e5aa384f8 100644 --- a/template/Dockerfile/images/postfix.jinja2 +++ b/template/Dockerfile/images/postfix.jinja2 @@ -1,6 +1,8 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro ubuntu(role='') -%} RUN /opt/docker/bin/control.sh service.enable postfix \ - {{ provision.runRoleInline('postfix', role) }} + {{ provision.runRoleInline('postfix', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/samson-deployment.jinja2 b/template/Dockerfile/images/samson-deployment.jinja2 index 27f08bb37..87a4e8ade 100644 --- a/template/Dockerfile/images/samson-deployment.jinja2 +++ b/template/Dockerfile/images/samson-deployment.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro general(role='') -%} @@ -30,7 +31,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ python-dotenv \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ ## Enable ansible for deployment user - && chmod 755 /usr/local/bin/ansible* + && chmod 755 /usr/local/bin/ansible* \ + {{ docker.cleanup() }} # NPM stack RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - \ @@ -39,7 +41,8 @@ RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - \ && npm install -g gulp \ && npm install -g grunt-cli \ && npm install -g bower \ - && npm install -g npm-cache + && npm install -g npm-cache \ + {{ docker.cleanup() }} # Deployer stack RUN set -x \ @@ -60,7 +63,8 @@ RUN set -x \ && tar -xzf /tmp/magallanes.tar.gz -C /tmp/ \ && /tmp/magallanes/bin/mage install --installDir=/opt/magallanes \ && rm -rf /tmp/magallanes.tar.gz /tmp/magallanes/ \ - && ln -s /opt/magallanes/latest/bin/mage /usr/bin/mage + && ln -s /opt/magallanes/latest/bin/mage /usr/bin/mage \ + {{ docker.cleanup() }} # Upload ADD database.yml /app/config/database.yml diff --git a/template/Dockerfile/images/sphinx.jinja2 b/template/Dockerfile/images/sphinx.jinja2 index 318bb2e63..77944ab0a 100644 --- a/template/Dockerfile/images/sphinx.jinja2 +++ b/template/Dockerfile/images/sphinx.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine() -%} @@ -20,5 +21,6 @@ RUN /usr/local/bin/apk-install \ && pip install t3SphinxThemeRtd \ && pip install t3fieldlisttable \ && pip install t3tablerows \ - && pip install t3targets + && pip install t3targets \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/ssh.jinja2 b/template/Dockerfile/images/ssh.jinja2 index 4f9b14256..ba5111b0a 100644 --- a/template/Dockerfile/images/ssh.jinja2 +++ b/template/Dockerfile/images/ssh.jinja2 @@ -1,5 +1,7 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro ubuntu() -%} -RUN /opt/docker/bin/control.sh service.enable ssh +RUN /opt/docker/bin/control.sh service.enable ssh \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/typo3-solr.jinja2 b/template/Dockerfile/images/typo3-solr.jinja2 new file mode 100644 index 000000000..aab380f68 --- /dev/null +++ b/template/Dockerfile/images/typo3-solr.jinja2 @@ -0,0 +1,54 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} +{% import 'Dockerfile/provision.jinja2' as provision %} + +{% macro guywithnose(release) -%} +USER root + +COPY ./solr/ /tmp/solr + +{{ docker.add('baselayout.tar', '/') }} + +WORKDIR / + +RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ + && /usr/local/bin/generate-dockerimage-info \ + && rm -rf /opt/solr/server \ + && mv /opt/solr/example/ /opt/solr/server/ \ + && rm -rf /opt/solr/server/solr \ + && mv /tmp/solr /opt/solr/server/solr \ + && mkdir -p /opt/solr/server/solr/typo3lib \ + && curl -sf -o /opt/solr/server/solr/typo3lib/solr-typo3-plugin.jar -L https://github.com/TYPO3-Solr/solr-typo3-plugin/releases/download/release-{{ release|replace(".", "_") }}/solr-typo3-plugin-{{ release }}.jar \ + && ln -s /opt/solr/contrib /opt/solr/server/solr/contrib \ + && mkdir -p /opt/solr/server/solr/data \ + && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ + && chown -R solr:solr /opt/solr/server/solr/ \ + {{ docker.cleanup() }} + +USER solr + +WORKDIR /opt/solr/server + +VOLUME ["/opt/solr/server/solr/data"] +{%- endmacro %} + + +{% macro official() -%} +USER root + +{{ docker.add('baselayout.tar', '/') }} + +COPY ./solr/ /tmp/solr + +RUN /usr/local/bin/apt-update \ + && /usr/local/bin/apt-install net-tools \ + && /usr/local/bin/generate-dockerimage-info \ + && rm -rf /opt/solr/server/solr \ + && mv /tmp/solr /opt/solr/server/solr \ + && mkdir -p /opt/solr/server/solr/data \ + && chown -R solr:solr /opt/solr/server/solr \ + {{ docker.cleanup() }} + +USER solr + +VOLUME ["/opt/solr/server/solr/data"] +{%- endmacro %} diff --git a/template/Dockerfile/images/varnish.jinja2 b/template/Dockerfile/images/varnish.jinja2 index 80ba54f4a..da59f81e2 100644 --- a/template/Dockerfile/images/varnish.jinja2 +++ b/template/Dockerfile/images/varnish.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro env() -%} @@ -14,5 +15,6 @@ ENV VARNISH_BACKEND_PORT "80" {% macro alpine() -%} RUN /usr/local/bin/apk-install \ - varnish + varnish \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/vsftp.jinja2 b/template/Dockerfile/images/vsftp.jinja2 index 56ae0a27e..fb2973b17 100644 --- a/template/Dockerfile/images/vsftp.jinja2 +++ b/template/Dockerfile/images/vsftp.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro ubuntu(role='') -%} @@ -9,5 +10,6 @@ RUN /usr/local/bin/apt-install \ /var/run/vsftpd/empty \ /var/log/supervisor \ {{ provision.registerRole('vsftp', entrypoint=True) }} \ - {{ provision.runRoleInline('vsftp', role) }} + {{ provision.runRoleInline('vsftp', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/layout.jinja2 b/template/Dockerfile/layout.jinja2 index 8ab05431e..1ee166977 100644 --- a/template/Dockerfile/layout.jinja2 +++ b/template/Dockerfile/layout.jinja2 @@ -20,6 +20,7 @@ {% import 'Dockerfile/images/ssh.jinja2' as ssh %} {% import 'Dockerfile/images/vsftp.jinja2' as vsftp %} {% import 'Dockerfile/images/samson-deployment.jinja2' as samsonDeployment %} +{% import 'Dockerfile/images/typo3-solr.jinja2' as typo3Solr %} {% import 'Dockerfile/images/varnish.jinja2' as varnish %} {% import 'Dockerfile/images/certbot.jinja2' as certbot %} {% import 'Dockerfile/images/liquibase.jinja2' as liquibase %} diff --git a/template/Dockerfile/provision.jinja2 b/template/Dockerfile/provision.jinja2 index e777c9559..6a57f83db 100644 --- a/template/Dockerfile/provision.jinja2 +++ b/template/Dockerfile/provision.jinja2 @@ -3,8 +3,7 @@ {% if role %}--role webdevops-{{ role }} {% endif %} {%- endfor -%}{%- endfor -%} \{%- endif %} - && /opt/docker/bin/bootstrap.sh -{% endmacro %} + && /opt/docker/bin/bootstrap.sh{% endmacro %} {% macro registerRole(role='',bootstrap=False,build=False,onbuild=False,entrypoint=False) %}&& /opt/docker/bin/provision add {%if bootstrap%}--tag bootstrap {% endif %}{%if build%}--tag build {% endif %}{%if onbuild%}--tag onbuild {% endif %}{%if entrypoint%}--tag entrypoint {% endif %} webdevops-{{ role }}{% endmacro %} diff --git a/tests/serverspec/spec/shared/bootstrap/distribution.rb b/tests/serverspec/spec/shared/bootstrap/distribution.rb index 89f945f34..951508015 100644 --- a/tests/serverspec/spec/shared/bootstrap/distribution.rb +++ b/tests/serverspec/spec/shared/bootstrap/distribution.rb @@ -15,14 +15,14 @@ # Ubuntu ######################### - describe command('lsb_release -i | tr "\t" " " | tr -s " "'), :if => os[:family] == 'ubuntu' do - its(:stdout) { should contain('Distributor ID: Ubuntu') } + describe command('cat /etc/dockerimage_lsb'), :if => os[:family] == 'ubuntu' do + its(:stdout) { should contain("Distributor ID:\tUbuntu") } its(:exit_status) { should eq 0 } end - describe command('lsb_release -r | tr "\t" " " | tr -s " "'), :if => os[:family] == 'debian' do - its(:stdout) { should contain('Release: ' + os[:version]) } + describe command('cat /etc/dockerimage_lsb'), :if => os[:family] == 'debian' do + its(:stdout) { should contain("Release:\t" + os[:version]) } its(:exit_status) { should eq 0 } end @@ -31,15 +31,15 @@ # Debian ######################### - describe command('lsb_release -i | tr "\t" " " | tr -s " "'), :if => os[:family] == 'debian' do - its(:stdout) { should contain('Distributor ID: Debian') } + describe command('cat /etc/dockerimage_lsb'), :if => os[:family] == 'debian' do + its(:stdout) { should contain("Distributor ID:\tDebian") } its(:exit_status) { should eq 0 } end - describe command('lsb_release -r | tr "\t" " " | tr -s " "'), :if => os[:family] == 'debian' do - its(:stdout) { should contain('Release: ' + os[:version] + '.') } + describe command('cat /etc/dockerimage_lsb'), :if => os[:family] == 'debian' do + its(:stdout) { should contain("Release:\t" + os[:version] + '.') } its(:exit_status) { should eq 0 } end