From d84cc5708cb28cbb065a31b46f09c3a9425eb97b Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 22 Jul 2018 20:38:52 +0200 Subject: [PATCH] Ansible dependencies --- Dockerfiles/work/Dockerfile-5.3 | 9 ++++++--- Dockerfiles/work/Dockerfile-5.4 | 9 ++++++--- Dockerfiles/work/Dockerfile-5.5 | 9 ++++++--- Dockerfiles/work/Dockerfile-5.6 | 9 ++++++--- Dockerfiles/work/Dockerfile-7.0 | 9 ++++++--- Dockerfiles/work/Dockerfile-7.1 | 9 ++++++--- Dockerfiles/work/Dockerfile-7.2 | 9 ++++++--- Dockerfiles/work/Dockerfile-7.3 | 9 ++++++--- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 4 ++-- build/ansible/group_vars/all.yml | 5 ++++- 10 files changed, 54 insertions(+), 27 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 167f50c..94cf99a 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -57,13 +57,14 @@ RUN set -x \ git \ git-flow \ git-svn \ - gnupg \ hostname \ htop \ imagemagick \ iputils-ping \ less \ libc-dev \ + libffi-dev\ + libssl-dev\ make \ mongodb-org-shell \ mongodb-org-tools \ @@ -79,7 +80,6 @@ RUN set -x \ python-cffi \ python-dev \ python-pip \ - python-setuptools \ python-wheel \ redis-tools \ rubygems \ @@ -103,7 +103,10 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install ansible \ + && pip install --upgrade pip \ +&& pip install --upgrade setuptools \ +&& pip install ansible \ + \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 36591dd..487b3d9 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -57,13 +57,14 @@ RUN set -x \ git \ git-flow \ git-svn \ - gnupg \ hostname \ htop \ imagemagick \ iputils-ping \ less \ libc-dev \ + libffi-dev\ + libssl-dev\ make \ mongodb-org-shell \ mongodb-org-tools \ @@ -79,7 +80,6 @@ RUN set -x \ python-cffi \ python-dev \ python-pip \ - python-setuptools \ python-wheel \ redis-tools \ rubygems \ @@ -103,7 +103,10 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install ansible \ + && pip install --upgrade pip \ +&& pip install --upgrade setuptools \ +&& pip install ansible \ + \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 5856e25..a8d1030 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -57,13 +57,14 @@ RUN set -x \ git \ git-flow \ git-svn \ - gnupg \ hostname \ htop \ imagemagick \ iputils-ping \ less \ libc-dev \ + libffi-dev\ + libssl-dev\ make \ mongodb-org-shell \ mongodb-org-tools \ @@ -79,7 +80,6 @@ RUN set -x \ python-cffi \ python-dev \ python-pip \ - python-setuptools \ python-wheel \ redis-tools \ rubygems \ @@ -103,7 +103,10 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install ansible \ + && pip install --upgrade pip \ +&& pip install --upgrade setuptools \ +&& pip install ansible \ + \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 4a75614..c71fbce 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -57,13 +57,14 @@ RUN set -x \ git \ git-flow \ git-svn \ - gnupg \ hostname \ htop \ imagemagick \ iputils-ping \ less \ libc-dev \ + libffi-dev\ + libssl-dev\ make \ mongodb-org-shell \ mongodb-org-tools \ @@ -79,7 +80,6 @@ RUN set -x \ python-cffi \ python-dev \ python-pip \ - python-setuptools \ python-wheel \ redis-tools \ rubygems \ @@ -103,7 +103,10 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install ansible \ + && pip install --upgrade pip \ +&& pip install --upgrade setuptools \ +&& pip install ansible \ + \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 346d860..12060f1 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -57,13 +57,14 @@ RUN set -x \ git \ git-flow \ git-svn \ - gnupg \ hostname \ htop \ imagemagick \ iputils-ping \ less \ libc-dev \ + libffi-dev\ + libssl-dev\ make \ mongodb-org-shell \ mongodb-org-tools \ @@ -79,7 +80,6 @@ RUN set -x \ python-cffi \ python-dev \ python-pip \ - python-setuptools \ python-wheel \ redis-tools \ rubygems \ @@ -103,7 +103,10 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install ansible \ + && pip install --upgrade pip \ +&& pip install --upgrade setuptools \ +&& pip install ansible \ + \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index f894242..11dd6c8 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -57,13 +57,14 @@ RUN set -x \ git \ git-flow \ git-svn \ - gnupg \ hostname \ htop \ imagemagick \ iputils-ping \ less \ libc-dev \ + libffi-dev\ + libssl-dev\ make \ mongodb-org-shell \ mongodb-org-tools \ @@ -79,7 +80,6 @@ RUN set -x \ python-cffi \ python-dev \ python-pip \ - python-setuptools \ python-wheel \ redis-tools \ rubygems \ @@ -103,7 +103,10 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install ansible \ + && pip install --upgrade pip \ +&& pip install --upgrade setuptools \ +&& pip install ansible \ + \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index b3d0cb5..1fbda0f 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -57,13 +57,14 @@ RUN set -x \ git \ git-flow \ git-svn \ - gnupg \ hostname \ htop \ imagemagick \ iputils-ping \ less \ libc-dev \ + libffi-dev\ + libssl-dev\ make \ mongodb-org-shell \ mongodb-org-tools \ @@ -79,7 +80,6 @@ RUN set -x \ python-cffi \ python-dev \ python-pip \ - python-setuptools \ python-wheel \ redis-tools \ rubygems \ @@ -103,7 +103,10 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install ansible \ + && pip install --upgrade pip \ +&& pip install --upgrade setuptools \ +&& pip install ansible \ + \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 1e98572..1e03e67 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -57,13 +57,14 @@ RUN set -x \ git \ git-flow \ git-svn \ - gnupg \ hostname \ htop \ imagemagick \ iputils-ping \ less \ libc-dev \ + libffi-dev\ + libssl-dev\ make \ mongodb-org-shell \ mongodb-org-tools \ @@ -79,7 +80,6 @@ RUN set -x \ python-cffi \ python-dev \ python-pip \ - python-setuptools \ python-wheel \ redis-tools \ rubygems \ @@ -103,7 +103,10 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install ansible \ + && pip install --upgrade pip \ +&& pip install --upgrade setuptools \ +&& pip install ansible \ + \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 43f7bea..b8c6a29 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -72,13 +72,14 @@ RUN set -x \ git \ git-flow \ git-svn \ - gnupg \ hostname \ htop \ imagemagick \ iputils-ping \ less \ libc-dev \ + libffi-dev\ + libssl-dev\ make \ mongodb-org-shell \ mongodb-org-tools \ @@ -94,7 +95,6 @@ RUN set -x \ python-cffi \ python-dev \ python-pip \ - python-setuptools \ python-wheel \ redis-tools \ rubygems \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 5ea7fc1..1f0c5e9 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -149,7 +149,10 @@ software_available: ansible: check: ansible --version | grep -E '^ansible [.0-9]+$' all: - command: pip install ansible + command: | + pip install --upgrade pip \ + && pip install --upgrade setuptools \ + && pip install ansible \ awesomeci: check: | mdl --version | grep -E '[.0-9]+' \