Browse code

Remove obsolete default container.

(cherry picked from commit 4173a3094192b7052cc3bdc4d44ed5d0b91ccb60)

Matt Clay authored on 2018/09/06 06:35:11
Showing 6 changed files
1 1
deleted file mode 100644
... ...
@@ -1,3 +0,0 @@
1
-*
2
-!docker
3
-!requirements
4 1
deleted file mode 100644
... ...
@@ -1,76 +0,0 @@
1
-FROM ubuntu:16.04
2
-
3
-COPY docker/deadsnakes.list /etc/apt/sources.list.d/deadsnakes.list
4
-
5
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F23C5A6CF475977595C89F51BA6932366A755776
6
-
7
-RUN apt-get update -y && \
8
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
9
-    ca-certificates \
10
-    curl \
11
-    gcc \
12
-    git \
13
-    libbz2-dev \
14
-    libffi-dev \
15
-    libreadline-dev \
16
-    libsqlite3-dev \
17
-    libxml2-dev \
18
-    libxslt1-dev \
19
-    locales \
20
-    make \
21
-    openssh-client \
22
-    openssl \
23
-    python2.6-dev \
24
-    python2.7-dev \
25
-    python3.5-dev \
26
-    python3.6-dev \
27
-    shellcheck \
28
-    && \
29
-    apt-get clean
30
-
31
-ADD https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer /tmp/pyenv-installer
32
-RUN bash -c 'PYENV_ROOT=/usr/local/opt/pyenv bash /tmp/pyenv-installer'
33
-COPY docker/python* /tmp/
34
-RUN bash -c 'PYENV_ROOT=/usr/local/opt/pyenv /usr/local/opt/pyenv/bin/pyenv install /tmp/python3.7.0a2'
35
-RUN ln -s /usr/local/opt/pyenv/versions/python3.7.0a2/bin/python3.7 /usr/local/bin/python3.7
36
-RUN ln -s /usr/local/opt/pyenv/versions/python3.7.0a2/bin/pip3.7 /usr/local/bin/pip3.7
37
-
38
-RUN rm /etc/apt/apt.conf.d/docker-clean
39
-RUN locale-gen en_US.UTF-8
40
-VOLUME /sys/fs/cgroup /run/lock /run /tmp
41
-
42
-ADD https://bootstrap.pypa.io/get-pip.py /tmp/get-pip.py
43
-
44
-COPY requirements/*.txt /tmp/requirements/
45
-COPY docker/requirements.sh /tmp/
46
-RUN cd /tmp/requirements && /tmp/requirements.sh
47
-
48
-RUN ln -s python2.7 /usr/bin/python2
49
-RUN ln -s python3.6 /usr/bin/python3
50
-RUN ln -s python3   /usr/bin/python
51
-
52
-# Install dotnet core SDK, pwsh, and other PS/.NET sanity test tools.
53
-# For now, we need to manually purge XML docs and other items from a Nuget dir to vastly reduce the image size.
54
-# See https://github.com/dotnet/dotnet-docker/issues/237 for details.
55
-RUN apt-get update -y && \
56
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
57
-    apt-transport-https \
58
-    && \
59
-    apt-get clean
60
-ADD https://packages.microsoft.com/config/ubuntu/16.04/prod.list /etc/apt/sources.list.d/microsoft.list
61
-RUN curl --silent https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
62
-RUN apt-get update -y && \
63
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
64
-    dotnet-sdk-2.1.4 \
65
-    powershell \
66
-    && \
67
-    find /usr/share/dotnet/sdk/NuGetFallbackFolder/ -name '*.xml' -type f -delete \
68
-    && \
69
-    apt-get clean
70
-RUN dotnet --version
71
-RUN pwsh --version
72
-COPY requirements/sanity.ps1 /tmp/
73
-RUN /tmp/sanity.ps1
74
-
75
-ENV container=docker
76
-CMD ["/sbin/init"]
77 1
deleted file mode 100644
... ...
@@ -1,2 +0,0 @@
1
-deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu xenial main
2
-deb-src http://ppa.launchpad.net/deadsnakes/ppa/ubuntu xenial main
3 1
deleted file mode 100644
... ...
@@ -1,8 +0,0 @@
1
-#require_gcc
2
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
3
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
4
-if has_tar_xz_support; then
5
-  install_package "Python-3.7.0a2" "https://www.python.org/ftp/python/3.7.0/Python-3.7.0a2.tar.xz#3e5adaa8a264b0c8eeab7b8a0185acec053b0d1547d2712ebc915153c4a52f28" ldflags_dirs standard verify_py37 ensurepip
6
-else
7
-  install_package "Python-3.7.0a2" "https://www.python.org/ftp/python/3.7.0/Python-3.7.0a2.tgz#e1fd8af5a80d99ab64e7754f1bdd6d8429bf82ead81c68809ce056af319577be" ldflags_dirs standard verify_py37 ensurepip
8
-fi
9 1
deleted file mode 100755
... ...
@@ -1,73 +0,0 @@
1
-#!/bin/bash -eu
2
-
3
-python_versions=(
4
-    2.6
5
-    2.7
6
-    3.5
7
-    3.6
8
-    3.7
9
-)
10
-
11
-requirements=()
12
-
13
-for requirement in *.txt; do
14
-    if [ "${requirement}" != "constraints.txt" ]; then
15
-        requirements+=("${requirement}")
16
-    fi
17
-done
18
-
19
-for python_version in "${python_versions[@]}"; do
20
-    version_requirements=()
21
-
22
-    for requirement in "${requirements[@]}"; do
23
-        case "${python_version}" in
24
-            "2.6")
25
-                case "${requirement}" in
26
-                    "integration.cloud.azure.txt") continue ;;
27
-                esac
28
-        esac
29
-
30
-        version_requirements+=("${requirement}")
31
-    done
32
-
33
-    echo "==> Installing pip for python ${python_version} ..."
34
-
35
-    set -x
36
-    "python${python_version}" --version
37
-    "python${python_version}" /tmp/get-pip.py -c constraints.txt
38
-    "pip${python_version}" --version --disable-pip-version-check
39
-    set +x
40
-
41
-    echo "==> Installing requirements for python ${python_version} ..."
42
-
43
-    for requirement in "${version_requirements[@]}"; do
44
-        set -x
45
-        "pip${python_version}" install --disable-pip-version-check -c constraints.txt -r "${requirement}"
46
-        set +x
47
-    done
48
-
49
-    echo "==> Checking for requirements conflicts for ${python_version} ..."
50
-
51
-    after=$("pip${python_version}" list --format=legacy)
52
-
53
-    for requirement in "${version_requirements[@]}"; do
54
-        before="${after}"
55
-
56
-        set -x
57
-        "pip${python_version}" install --disable-pip-version-check -c constraints.txt -r "${requirement}"
58
-        set +x
59
-
60
-        after=$("pip${python_version}" list --format=legacy)
61
-
62
-        if [ "${before}" != "${after}" ]; then
63
-            echo "==> Conflicts detected in requirements for python ${python_version}: ${requirement}"
64
-            echo ">>> Before"
65
-            echo "${before}"
66
-            echo ">>> After"
67
-            echo "${after}"
68
-            exit 1
69
-        fi
70
-    done
71
-
72
-    echo "==> Finished with requirements for python ${python_version}."
73
-done
... ...
@@ -569,9 +569,6 @@ class PathMapper(object):
569 569
             if path == 'test/runner/completion/docker.txt':
570 570
                 return all_tests(self.args, force=True)  # force all tests due to risk of breaking changes in new test environment
571 571
 
572
-        if path.startswith('test/runner/docker/'):
573
-            return minimal  # not used by tests, only used to build the default container
574
-
575 572
         if path.startswith('test/runner/lib/cloud/'):
576 573
             cloud_target = 'cloud/%s/' % name
577 574
 
... ...
@@ -614,12 +611,6 @@ class PathMapper(object):
614 614
                     }
615 615
 
616 616
         if path.startswith('test/runner/'):
617
-            if dirname == 'test/runner' and name in (
618
-                    'Dockerfile',
619
-                    '.dockerignore',
620
-            ):
621
-                return minimal  # not used by tests, only used to build the default container
622
-
623 617
             return all_tests(self.args)  # test infrastructure, run all tests
624 618
 
625 619
         if path.startswith('test/utils/shippable/tools/'):