Skip to content

Commit f4e3c04

Browse files
mblaschkemblaschke
committed
Merge branch 'hotfix/bootstrap-build-fix'
2 parents ab06d31 + 6ed0618 commit f4e3c04

File tree

10 files changed

+225
-33
lines changed

10 files changed

+225
-33
lines changed

‎docker/bootstrap/alpine-3/Dockerfile‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,16 @@ RUN set -x \
3535
py-setuptools \
3636
py-crypto \
3737
py-pip \
38+
py-cparser \
39+
py-cryptography \
40+
py-markupsafe \
41+
py-cffi \
42+
py-yaml \
43+
py-jinja2 \
44+
py-paramiko \
3845
&& pip install --upgrade pip \
39-
&& pip install ansible
46+
&& hash -r \
47+
&& pip install ansible \
48+
&& chmod 750 /usr/bin/ansible* \
49+
# Cleanup
50+
&& apk del python-dev

‎docker/bootstrap/debian-7/Dockerfile‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,36 @@ RUN export DEBIAN_FRONTEND=noninteractive \
2222
&& echo "export TERM=xterm" >> /root/.bashrc \
2323
# Enable non-free
2424
&& sed -ri 's/(deb.*\/debian wheezy main)/\1 contrib non-free /' -- /etc/apt/sources.list \
25-
# System update
25+
# System updatei
2626
&& /usr/local/bin/apt-upgrade \
2727
# Base stuff
2828
&& /usr/local/bin/apt-install \
2929
lsb-release \
3030
ca-certificates \
31-
# Install ansible
32-
python-dev \
31+
locales \
32+
# Generate base locale
33+
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
34+
&& locale-gen \
35+
&& /usr/local/bin/apt-install \
36+
# Install ansible
37+
python-minimal \
3338
python-setuptools \
3439
python-pip \
35-
&& pip install ansible
36-
40+
python-paramiko \
41+
python-jinja2 \
42+
python-dev \
43+
libffi-dev \
44+
libssl-dev \
45+
build-essential \
46+
&& pip install --upgrade pip \
47+
&& hash -r \
48+
&& pip install ansible \
49+
&& chmod 750 /usr/local/bin/ansible* \
50+
# Cleanup
51+
&& apt-get purge -y -f --force-yes \
52+
python-dev \
53+
build-essential \
54+
libssl-dev \
55+
libffi-dev \
56+
&& apt-get autoremove -y -f \
57+
&& apt-get clean -y

‎docker/bootstrap/debian-8/Dockerfile‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,37 @@ RUN export DEBIAN_FRONTEND=noninteractive \
2222
&& echo "export TERM=xterm" >> /root/.bashrc \
2323
# Enable non-free
2424
&& sed -ri 's/(deb.*\/debian jessie main)/\1 contrib non-free /' -- /etc/apt/sources.list \
25-
# System update
25+
# System updatei
2626
&& /usr/local/bin/apt-upgrade \
2727
# Base stuff
2828
&& /usr/local/bin/apt-install \
2929
lsb-release \
3030
ca-certificates \
31-
# Install ansible
32-
python-dev \
31+
locales \
32+
# Generate base locale
33+
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
34+
&& locale-gen \
35+
&& /usr/local/bin/apt-install \
36+
# Install ansible
37+
python-minimal \
3338
python-setuptools \
3439
python-pip \
35-
&& pip install ansible
40+
python-paramiko \
41+
python-jinja2 \
42+
python-dev \
43+
libffi-dev \
44+
libssl-dev \
45+
build-essential \
46+
&& pip install --upgrade pip \
47+
&& hash -r \
48+
&& pip install ansible \
49+
&& chmod 750 /usr/local/bin/ansible* \
50+
# Cleanup
51+
&& apt-get purge -y -f --force-yes \
52+
python-dev \
53+
build-essential \
54+
libssl-dev \
55+
libffi-dev \
56+
&& apt-get autoremove -y -f \
57+
&& apt-get clean -y
3658

‎docker/bootstrap/debian-9/Dockerfile‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,37 @@ RUN export DEBIAN_FRONTEND=noninteractive \
2222
&& echo "export TERM=xterm" >> /root/.bashrc \
2323
# Enable non-free
2424
&& sed -ri 's/(deb.*\/debian stretch main)/\1 contrib non-free /' -- /etc/apt/sources.list \
25-
# System update
25+
# System updatei
2626
&& /usr/local/bin/apt-upgrade \
2727
# Base stuff
2828
&& /usr/local/bin/apt-install \
2929
lsb-release \
3030
ca-certificates \
31-
# Install ansible
32-
python-dev \
31+
locales \
32+
# Generate base locale
33+
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
34+
&& locale-gen \
35+
&& /usr/local/bin/apt-install \
36+
# Install ansible
37+
python-minimal \
3338
python-setuptools \
3439
python-pip \
35-
&& pip install ansible
40+
python-paramiko \
41+
python-jinja2 \
42+
python-dev \
43+
libffi-dev \
44+
libssl-dev \
45+
build-essential \
46+
&& pip install --upgrade pip \
47+
&& hash -r \
48+
&& pip install ansible \
49+
&& chmod 750 /usr/local/bin/ansible* \
50+
# Cleanup
51+
&& apt-get purge -y -f --force-yes \
52+
python-dev \
53+
build-essential \
54+
libssl-dev \
55+
libffi-dev \
56+
&& apt-get autoremove -y -f \
57+
&& apt-get clean -y
3658

‎docker/bootstrap/ubuntu-12.04/Dockerfile‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,35 @@ RUN export DEBIAN_FRONTEND=noninteractive \
2626
&& echo "deb-src http://archive.ubuntu.com/ubuntu/ precise multiverse" >> /etc/apt/sources.list \
2727
# Fix root terminal
2828
&& echo "export TERM=xterm" >> /root/.bashrc \
29+
# Generate base locale
30+
&& locale-gen en_US.UTF-8 \
2931
# System update
3032
&& /usr/local/bin/apt-upgrade \
3133
# Install base stuff
3234
&& /usr/local/bin/apt-install \
3335
python-software-properties \
3436
lsb-release \
3537
ca-certificates \
36-
# Install ansible
37-
python-dev \
38+
# Install ansible
39+
python-minimal \
3840
python-setuptools \
3941
python-pip \
40-
&& pip install ansible
42+
python-paramiko \
43+
python-jinja2 \
44+
python-dev \
45+
libffi-dev \
46+
libssl-dev \
47+
build-essential \
48+
&& pip install --upgrade pip \
49+
&& hash -r \
50+
&& pip install ansible \
51+
&& chmod 750 /usr/local/bin/ansible* \
52+
# Cleanup
53+
&& apt-get purge -y -f --force-yes \
54+
python-dev \
55+
build-essential \
56+
libssl-dev \
57+
libffi-dev \
58+
&& apt-get autoremove -y -f \
59+
&& apt-get clean -y
4160

‎docker/bootstrap/ubuntu-14.04/Dockerfile‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \
2121
&& set -x \
2222
# Fix root terminal
2323
&& echo "export TERM=xterm" >> /root/.bashrc \
24+
# Generate base locale
25+
&& locale-gen en_US.UTF-8 \
2426
# System update
2527
&& /usr/local/bin/apt-upgrade \
2628
# Install base stuff
@@ -31,8 +33,25 @@ RUN export DEBIAN_FRONTEND=noninteractive \
3133
&& apt-add-repository multiverse \
3234
# Install ansible
3335
&& /usr/local/bin/apt-install \
34-
python-dev \
36+
python-minimal \
3537
python-setuptools \
3638
python-pip \
37-
&& pip install ansible
39+
python-paramiko \
40+
python-jinja2 \
41+
python-dev \
42+
libffi-dev \
43+
libssl-dev \
44+
build-essential \
45+
&& pip install --upgrade pip \
46+
&& hash -r \
47+
&& pip install ansible \
48+
&& chmod 750 /usr/local/bin/ansible* \
49+
# Cleanup
50+
&& apt-get purge -y -f --force-yes \
51+
python-dev \
52+
build-essential \
53+
libssl-dev \
54+
libffi-dev \
55+
&& apt-get autoremove -y -f \
56+
&& apt-get clean -y
3857

‎docker/bootstrap/ubuntu-15.04/Dockerfile‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \
2121
&& set -x \
2222
# Fix root terminal
2323
&& echo "export TERM=xterm" >> /root/.bashrc \
24+
# Generate base locale
25+
&& locale-gen en_US.UTF-8 \
2426
# System update
2527
&& /usr/local/bin/apt-upgrade \
2628
# Install base stuff
@@ -31,8 +33,25 @@ RUN export DEBIAN_FRONTEND=noninteractive \
3133
&& apt-add-repository multiverse \
3234
# Install ansible
3335
&& /usr/local/bin/apt-install \
34-
python-dev \
36+
python-minimal \
3537
python-setuptools \
3638
python-pip \
37-
&& pip install ansible
39+
python-paramiko \
40+
python-jinja2 \
41+
python-dev \
42+
libffi-dev \
43+
libssl-dev \
44+
build-essential \
45+
&& pip install --upgrade pip \
46+
&& hash -r \
47+
&& pip install ansible \
48+
&& chmod 750 /usr/local/bin/ansible* \
49+
# Cleanup
50+
&& apt-get purge -y -f --force-yes \
51+
python-dev \
52+
build-essential \
53+
libssl-dev \
54+
libffi-dev \
55+
&& apt-get autoremove -y -f \
56+
&& apt-get clean -y
3857

‎docker/bootstrap/ubuntu-15.10/Dockerfile‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \
2121
&& set -x \
2222
# Fix root terminal
2323
&& echo "export TERM=xterm" >> /root/.bashrc \
24+
# Generate base locale
25+
&& locale-gen en_US.UTF-8 \
2426
# System update
2527
&& /usr/local/bin/apt-upgrade \
2628
# Install base stuff
@@ -31,8 +33,24 @@ RUN export DEBIAN_FRONTEND=noninteractive \
3133
&& apt-add-repository multiverse \
3234
# Install ansible
3335
&& /usr/local/bin/apt-install \
34-
python-dev \
36+
python-minimal \
3537
python-setuptools \
3638
python-pip \
37-
&& pip install ansible
38-
39+
python-paramiko \
40+
python-jinja2 \
41+
python-dev \
42+
libffi-dev \
43+
libssl-dev \
44+
build-essential \
45+
&& pip install --upgrade pip \
46+
&& hash -r \
47+
&& pip install ansible \
48+
&& chmod 750 /usr/local/bin/ansible* \
49+
# Cleanup
50+
&& apt-get purge -y -f --force-yes \
51+
python-dev \
52+
build-essential \
53+
libssl-dev \
54+
libffi-dev \
55+
&& apt-get autoremove -y -f \
56+
&& apt-get clean -y

‎docker/bootstrap/ubuntu-16.04/Dockerfile‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \
2121
&& set -x \
2222
# Fix root terminal
2323
&& echo "export TERM=xterm" >> /root/.bashrc \
24+
# Generate base locale
25+
&& locale-gen en_US.UTF-8 \
2426
# System update
2527
&& /usr/local/bin/apt-upgrade \
2628
# Install base stuff
@@ -31,9 +33,24 @@ RUN export DEBIAN_FRONTEND=noninteractive \
3133
&& apt-add-repository multiverse \
3234
# Install ansible
3335
&& /usr/local/bin/apt-install \
34-
python-dev \
36+
python-minimal \
3537
python-setuptools \
3638
python-pip \
39+
python-paramiko \
40+
python-jinja2 \
41+
python-dev \
42+
libffi-dev \
43+
libssl-dev \
44+
build-essential \
45+
&& pip install --upgrade pip \
46+
&& hash -r \
3747
&& pip install ansible \
38-
## workaround for ubuntu 16.04
39-
&& chmod +x /usr/local/bin/ansible*
48+
&& chmod 750 /usr/local/bin/ansible* \
49+
# Cleanup
50+
&& apt-get purge -y -f --force-yes \
51+
python-dev \
52+
build-essential \
53+
libssl-dev \
54+
libffi-dev \
55+
&& apt-get autoremove -y -f \
56+
&& apt-get clean -y

‎docker/samson-deployment/latest/Dockerfile‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,41 @@ RUN export DEBIAN_FRONTEND=noninteractive \
2222
&& set -x \
2323
# Fix root terminal
2424
&& echo "export TERM=xterm" >> /root/.bashrc \
25-
# System update
25+
# Enable non-free
26+
&& sed -ri 's/(deb.*\/debian jessie main)/\1 contrib non-free /' -- /etc/apt/sources.list \
27+
# System updatei
2628
&& /usr/local/bin/apt-upgrade \
2729
# Base stuff
2830
&& /usr/local/bin/apt-install \
2931
lsb-release \
30-
# Generate locales
31-
locales-all \
32-
# Install ansible
33-
python-dev \
32+
ca-certificates \
33+
locales \
34+
# Generate base locale
35+
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
36+
&& locale-gen \
37+
&& /usr/local/bin/apt-install \
38+
# Install ansible
39+
python-minimal \
40+
python-setuptools \
3441
python-pip \
35-
&& pip install ansible
42+
python-paramiko \
43+
python-jinja2 \
44+
python-dev \
45+
libffi-dev \
46+
libssl-dev \
47+
build-essential \
48+
&& pip install --upgrade pip \
49+
&& hash -r \
50+
&& pip install ansible \
51+
&& chmod 750 /usr/local/bin/ansible* \
52+
# Cleanup
53+
&& apt-get purge -y -f --force-yes \
54+
python-dev \
55+
build-essential \
56+
libssl-dev \
57+
libffi-dev \
58+
&& apt-get autoremove -y -f \
59+
&& apt-get clean -y
3660

3761
###############################################################################
3862
# Base

0 commit comments

Comments
 (0)