Use official docker:dind image instead of custom image

[thaJeztah]

This replaces the custom dockerswarm/dind image (https://hub.docker.com/r/dockerswarm/dind) with the official dind images, which should provide the same functionality.

The custom image is build from a private repo (https://github.com/docker/dind), using this dockerfile;

# Dockerfile for building Docker
FROM debian:jessie

# compile and runtime deps
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \
        ca-certificates \
        curl \
        iptables \
        procps \
        e2fsprogs \
        xz-utils \
        git \
    && apt-get clean && rm -rf /var/lib/apt/lists/*

ARG VERSION
COPY get_docker.sh /get_docker.sh
RUN bash /get_docker.sh

RUN curl -L -o /dind https://raw.githubusercontent.com/docker/docker/master/hack/dind \
    && chmod +x /dind

VOLUME /var/lib/docker

ENTRYPOINT ["/dind"]

At a glance, I don't see anything in there that the official docker:dind images don't provide, so we might as well use those.

If this works successfully, we can disable the builds of that custom image after this is merged

[thaJeztah]

(hope this works, as the official images enable TLS by default, so possibly some changes could still be needed 🤞)

[thaJeztah]

Ok; looks like one test is failing; at a glance, I suspect it's making some assumptions that are specific to how the previous image was set up (the docker top command is known to produce difference output depending on the distro it's running on);

__________________________ ContainerTopTest.test_top ___________________________
tests/integration/api_container_test.py:1115: in test_top
    assert res['Titles'] == [
E   AssertionError: assert ['PID', 'USER...E', 'COMMAND'] == ['UID', 'PID',...', 'TTY', ...]
E     At index 0 diff: u'PID' != 'UID'
E     Right contains more items, first extra item: 'STIME'
E     Full diff:
E     - [u'PID', u'USER', u'TIME', u'COMMAND']
E     + ['UID', 'PID', 'PPID', 'C', 'STIME', 'TTY', 'TIME', 'CMD']
____________________ ContainerTopTest.test_top_with_psargs _____________________
tests/integration/api_container_test.py:1133: in test_top_with_psargs
    assert res['Titles'] == [
E   AssertionError: assert ['PID', 'USER...E', 'COMMAND'] == ['USER', 'PID'...', 'RSS', ...]
E     At index 0 diff: u'PID' != 'USER'
E     Right contains more items, first extra item: 'VSZ'
E     Full diff:
E     - [u'PID', u'USER', u'TIME', u'COMMAND']
E     + ['USER',
E     +  'PID',
E     +  '%CPU',...
E     
E     ...Full output truncated (9 lines hidden), use '-vv' to show

For example, on Ubuntu, docker top outputs:

docker top b92eb3f7099e
UID                 PID                 PPID                C                   STIME               TTY                 TIME                CMD
www-data            3753                12133               0                   2019                ?                   00:00:05            apache2 -DFOREGROUND

Whereas on Alpine, the output is:

PID                 USER                TIME                COMMAND
44862               root                0:03                dockerd -H tcp://0.0.0.0:2375 --experimental

[thaJeztah]

OK, this is all green now.

@ulyssessouza @chris-crone @shin- PTAL

[thaJeztah]

Looks like the dockerswarm/dind image is also used in CI for classic swarm, so we should update that repository as well before we can fully get rid of that image (e.g. https://github.com/docker/swarm/blob/b9091461c559c357e4017b400e24c07517399f4b/test/integration/Dockerfile)

[chris-crone]

LGTM, thanks @thaJeztah !

[chris-crone]

Looks like the dockerswarm/dind image is also used in CI for classic swarm, so we should update that repository as well before we can fully get rid of that image

@thaJeztah please create an issue so that we can track doing that work 🤗

[thaJeztah]

Opened docker-archive/classicswarm#2973

[ulyssessouza]

LGTM