Refactoring and cleanup

- Remove full path for docker-image-cleanup
- Add webdevops/dockerfile-build-env (build environment for Dockerfile repository)
- Add new docker-image-info command to gather information of current image
- Restore default locale
- Remove editors (moved to -dev images)
- Replace php:5.6, php:7.0 and php:7.1 with symlink (automatic duplication detection, avoid duplicate test running)
- Improve duplication checks for images (skip duplicate serverspec tests, but in build fail if source is not available)
- Remove provision.sh test
- Remove logwatch.sh
- Remove logwatch
- Improve service provisioning
- Remove sudo
- Remove syslog (provision on demand with 'docker-service-enable syslog')
- Cleanup entrypoint and scripts
- Only run entrypoint provision if roles are available (skip python task)

Author: mblaschke

baselayout/usr/local/bin/docker-image-cleanup

@@ -3,7 +3,7 @@
 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)
+LSB_FAMILY=$(docker-image-info family)
 
 case "$LSB_FAMILY" in
     Debian)

baselayout/usr/local/bin/docker-image-info

@@ -0,0 +1,87 @@
+#!/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
+
+help() {
+    if [ -n "$1" ]; then
+        echo "$1"
+        echo ""
+    fi
+
+    echo "Usage: $0 <argument>"
+    echo ""
+    echo "  Application arguments:"
+    echo "         family    Get distribution family"
+    echo "           dist    Get distribution name"
+    echo "   dist-version    Get distribution version"
+    echo "   dist-release    Get distribution release"
+    echo "  dist-codename    Get distribution codename"
+    echo "            lsb    Get lsb informations (if available)"
+    echo "       lsb-desc    Get lsb description (if available)"
+    echo "      buildtime    Get buildtime of docker image"
+    echo ""
+
+    exit $2
+
+}
+
+if [ "$#" -ne 1 ]; then
+        help "[ERROR] Invalid argument" 1
+fi
+
+INFO_FILE=""
+
+case "$1" in
+    dist-family|distribution-family|family)
+        INFO_FILE=/opt/docker/etc/.registry/image_info_distribution_family
+        ;;
+
+    dist|distribution)
+        INFO_FILE=/opt/docker/etc/.registry/image_info_distribution
+        ;;
+
+    dist-version|distribution-version)
+        INFO_FILE=/opt/docker/etc/.registry/image_info_distribution_version
+        ;;
+
+    dist-release|distribution-release)
+        INFO_FILE=/opt/docker/etc/.registry/image_info_lsb_release
+        ;;
+
+    dist-codename|distribution-codename)
+        INFO_FILE=/opt/docker/etc/.registry/image_info_lsb_codename
+        ;;
+
+    lsb)
+        INFO_FILE=/opt/docker/etc/.registry/image_info_lsb
+        ;;
+
+    lsb-desc|lsb-description)
+        INFO_FILE=/opt/docker/etc/.registry/image_info_lsb_description
+        ;;
+
+    buildtime)
+        INFO_FILE=/opt/docker/etc/.registry/image_info_buildtime
+        ;;
+
+    help)
+        help "" 0
+        ;;
+
+    *)
+        help "[ERROR] Invalid argument" 1
+        ;;
+esac
+
+if [ -n "$INFO_FILE" ]; then
+    if [ -f "$INFO_FILE" ]; then
+        cat -- "$INFO_FILE"
+    else
+        echo "[ERROR] Infomation file $INFO_FILE not found!"
+        echo "        Please run generate-dockerimage-info on docker image creation!"
+        exit 2
+    fi
+else
+    help "" 1
+fi

baselayout/usr/local/bin/generate-dockerimage-info

@@ -50,31 +50,32 @@ esac
 #############################
 
 echo "Detected $LSB_FAMILY"
-echo "$LSB_FAMILY" > /etc/dockerimage_distribution_family
-echo "$LSB_FAMILY" > /etc/dockerimage_distribution
+
+mkdir -p /opt/docker/etc/.registry/
+echo "$LSB_FAMILY" > /opt/docker/etc/.registry/image_info_distribution_family
+echo "$LSB_FAMILY" > /opt/docker/etc/.registry/image_info_distribution
+date +%s >/opt/docker/etc/.registry/image_info_buildtime
 
 # 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
+touch /opt/docker/etc/.registry/image_info_distribution_version
+touch /opt/docker/etc/.registry/image_info_lsb
+touch /opt/docker/etc/.registry/image_info_lsb_description
+touch /opt/docker/etc/.registry/image_info_lsb_release
+touch /opt/docker/etc/.registry/image_info_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
+        lsb_release -i -s > /opt/docker/etc/.registry/image_info_distribution
+        lsb_release -r -s > /opt/docker/etc/.registry/image_info_distribution_version
+        lsb_release -a > /opt/docker/etc/.registry/image_info_lsb
+        lsb_release -d -s > /opt/docker/etc/.registry/image_info_lsb_description
+        lsb_release -r -s > /opt/docker/etc/.registry/image_info_lsb_release
+        lsb_release -c -s > /opt/docker/etc/.registry/image_info_lsb_codename
         ;;
 
     Alpine)
-        cat /etc/alpine-release > /etc/dockerimage_distribution_version
+        cat /etc/alpine-release > /opt/docker/etc/.registry/image_info_distribution_version
         ;;
 esac
 

baselayout/usr/local/bin/generate-locales

@@ -5,23 +5,24 @@ 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)
+IMAGE_DISTRIBUTION_FAMILY=$(docker-image-info family)
+IMAGE_DISTRIBUTION=$(docker-image-info distribution)
+IMAGE_DISTRIBUTION_VERSION=$(docker-image-info distribution-version)
 
 #######################################
 ## Debian
 #######################################
 
-if [[ "$LSB_DISTRIBUTION" == "Debian" ]]; then
+if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]]; then
     /usr/local/bin/apt-install locales-all
 fi
 
 #######################################
 ## Ubuntu
 #######################################
 
-if [[ "$LSB_DISTRIBUTION" == "Ubuntu" ]]; then
-    if [[ "$(echo $LSB_DISTRIBUTION_VERSION| cut -f 1 -d .)" -ge "16" ]]; then
+if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]]; then
+    if [[ "$(echo $IMAGE_DISTRIBUTION_VERSION| cut -f 1 -d .)" -ge "16" ]]; then
         # Ubuntu 16.04 or later
         /usr/local/bin/apt-install locales-all
     else
@@ -35,12 +36,12 @@ fi
 ## RedHat family
 #######################################
 
-function localedefdebug() {
-    echo $*
-    localedef "$@"
-}
+if [[ "$IMAGE_DISTRIBUTION_FAMILY" == "RedHat" ]]; then
 
-if [[ -f /etc/redhat-release ]]; then
+    function localedefdebug() {
+        echo $*
+        localedef "$@"
+    }
 
     # Failing locales
     ## && localedefdebug -c -i bo_CN -f UTF-8 bo_CN.utf8 \

bin/webdevops/DockerfileUtility.py

@@ -79,6 +79,8 @@ def parse_docker_info_from_path(path):
         image_name = (image_name_info['image'] if 'image' in image_name_info else '')
         image_tag = (image_name_info['tag'] if 'tag' in image_name_info else '')
 
+        image_is_duplicate = False
+
         # check if path is linked
         if os.path.islink(os.path.dirname(path)):
             linked_image_name_info = ([m.groupdict() for m in path_regex.finditer(os.path.realpath(path))])[0]
@@ -88,6 +90,7 @@ def parse_docker_info_from_path(path):
             linked_image_tag = (linked_image_name_info['tag'] if 'tag' in linked_image_name_info else '')
 
             image_from = image_prefix + linked_image_repository + '/' + linked_image_name + ':' + linked_image_tag
+            image_is_duplicate = True
         else:
             image_from = parse_dockerfile_from_statement(path)
 
@@ -97,7 +100,8 @@ def parse_docker_info_from_path(path):
             'tag': image_tag,
             'repository': image_prefix + image_repository,
             'imageName': image_name,
-            'from': image_from
+            'from': image_from,
+            'duplicate': image_is_duplicate
         }
         return imageInfo
 

bin/webdevops/doit/DoitReporter.py

@@ -237,13 +237,14 @@ def complete_run(self):
                 if 'FinishChain|' in task['name']:
                     continue
 
-                self.task_stdout(
-                    title=task['name'],
-                    duration=task['elapsed'],
-                    stdout=task['out'],
-                    stderr=task['err'],
-                    error=task['error']
-                )
+                if task['result'] != 'fail':
+                    self.task_stdout(
+                        title=task['name'],
+                        duration=task['elapsed'],
+                        stdout=task['out'],
+                        stderr=task['err'],
+                        error=task['error']
+                    )
 
         # show failed tasks (at the end)
         for task in task_result_list:

bin/webdevops/taskloader/DockerBuildTaskLoader.py

@@ -59,6 +59,13 @@ def task_run(docker_client, dockerfile, configuration, task):
         Build one Dockerfile
         """
 
+        # check if dockerfile is symlink, skipping tests if just a duplicate image
+        # image is using the same hashes
+        if dockerfile['image']['duplicate'] and not task.task_dep:
+            print '  Docker image %s is build from symlink but not included in build chain, please include %s' % (dockerfile['image']['fullname'], dockerfile['image']['from'])
+            print '  -> failing build'
+            return False
+
         pull_parent_image = DockerfileUtility.check_if_base_image_needs_pull(dockerfile, configuration)
 
         if configuration.get('dryRun'):

bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py

@@ -61,6 +61,14 @@ def task_run(dockerfile, configuration, task):
         """
         Run test
         """
+
+        # check if dockerfile is symlink, skipping tests if just a duplicate image
+        # image is using the same hashes
+        if dockerfile['image']['duplicate']:
+            print '  Docker image %s is build from symlink and duplicate of %s' % (dockerfile['image']['fullname'], dockerfile['image']['from'])
+            print '  -> skipping tests'
+            return True
+
         # Check if current image is a toolimage (no daemon)
         is_toolimage = False
         for term in configuration.get('dockerTest.toolImages', {}):

docker/ansible/alpine/Dockerfile

@@ -25,4 +25,4 @@ RUN /usr/local/bin/apk-install \
     && chmod 750 /usr/bin/ansible* \
     # Cleanup
     && apk del python-dev \
-    && /usr/local/bin/docker-image-cleanup
+    && docker-image-cleanup

docker/ansible/centos-7/Dockerfile

@@ -25,4 +25,4 @@ RUN /usr/local/bin/yum-install \
     && chmod 750 /usr/bin/ansible* \
     # Cleanup
     && yum erase -y python-devel \
-    && /usr/local/bin/docker-image-cleanup
+    && docker-image-cleanup