Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optimization debian package manager tweaks #61

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 1.9-debian8-onbuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MAINTAINER William Yeh <[email protected]>
RUN echo "===> Installing python, sudo, and supporting tools..." && \
apt-get update -y && apt-get install --fix-missing && \
DEBIAN_FRONTEND=noninteractive \
apt-get install -y \
apt-get --no-install-recommends -y install \
python python-yaml sudo \
curl gcc python-pip python-dev libffi-dev libssl-dev && \
apt-get -y --purge remove python-cffi && \
Expand Down Expand Up @@ -43,7 +43,7 @@ COPY ansible-playbook-wrapper /usr/local/bin/

ONBUILD RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
echo "===> Updating TLS certificates..." && \
apt-get install -y openssl ca-certificates
apt-get --no-install-recommends -y install openssl ca-certificates

ONBUILD WORKDIR /tmp
ONBUILD COPY . /tmp
Expand Down
2 changes: 1 addition & 1 deletion 1.9-debian8-onbuild/ansible-playbook-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
fi

if [ -f "$REQUIREMENTS" ]; then
apt-get install -y git
apt-get --no-install-recommends -y install git
ansible-galaxy install -r $REQUIREMENTS
fi

Expand Down
4 changes: 2 additions & 2 deletions 1.9-debian8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MAINTAINER William Yeh <[email protected]>
RUN echo "===> Installing python, sudo, and supporting tools..." && \
apt-get update -y && apt-get install --fix-missing && \
DEBIAN_FRONTEND=noninteractive \
apt-get install -y \
apt-get --no-install-recommends -y install \
python python-yaml sudo \
curl gcc python-pip python-dev libffi-dev libssl-dev && \
apt-get -y --purge remove python-cffi && \
Expand All @@ -28,7 +28,7 @@ RUN echo "===> Installing python, sudo, and supporting tools..." && \
\
\
echo "===> Installing handy tools (not absolutely required)..." && \
apt-get install -y sshpass openssh-client && \
apt-get --no-install-recommends -y install sshpass openssh-client && \
\
\
echo "===> Removing unused APT resources..." && \
Expand Down
4 changes: 2 additions & 2 deletions 1.9-ubuntu14.04-onbuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN echo "===> Adding Ansible's PPA..." && \
\
\
echo "===> Installing Ansible..." && \
apt-get install -y ansible && \
apt-get --no-install-recommends -y install ansible && \
\
\
echo "===> Removing Ansible PPA..." && \
Expand All @@ -35,7 +35,7 @@ COPY ansible-playbook-wrapper /usr/local/bin/

ONBUILD RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
echo "===> Updating TLS certificates..." && \
apt-get install -y openssl ca-certificates
apt-get --no-install-recommends -y install openssl ca-certificates

ONBUILD WORKDIR /tmp
ONBUILD COPY . /tmp
Expand Down
2 changes: 1 addition & 1 deletion 1.9-ubuntu14.04-onbuild/ansible-playbook-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
fi

if [ -f "$REQUIREMENTS" ]; then
apt-get install -y git
apt-get --no-install-recommends -y install git
ansible-galaxy install -r $REQUIREMENTS
fi

Expand Down
4 changes: 2 additions & 2 deletions 1.9-ubuntu14.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ RUN echo "===> Adding Ansible's PPA..." && \
\
\
echo "===> Installing Ansible..." && \
apt-get install -y ansible && \
apt-get --no-install-recommends -y install ansible && \
\
\
echo "===> Installing handy tools (not absolutely required)..." && \
apt-get install -y sshpass openssh-client && \
apt-get --no-install-recommends -y install sshpass openssh-client && \
\
\
echo "===> Removing Ansible PPA..." && \
Expand Down
4 changes: 2 additions & 2 deletions debian8-onbuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MAINTAINER William Yeh <[email protected]>
RUN echo "===> Installing python, sudo, and supporting tools..." && \
apt-get update -y && apt-get install --fix-missing && \
DEBIAN_FRONTEND=noninteractive \
apt-get install -y \
apt-get --no-install-recommends -y install \
python python-yaml sudo \
curl gcc python-pip python-dev libffi-dev libssl-dev && \
apt-get -y --purge remove python-cffi && \
Expand Down Expand Up @@ -43,7 +43,7 @@ COPY ansible-playbook-wrapper /usr/local/bin/

ONBUILD RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
echo "===> Updating TLS certificates..." && \
apt-get install -y openssl ca-certificates
apt-get --no-install-recommends -y install openssl ca-certificates

ONBUILD WORKDIR /tmp
ONBUILD COPY . /tmp
Expand Down
2 changes: 1 addition & 1 deletion debian8-onbuild/ansible-playbook-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
fi

if [ -f "$REQUIREMENTS" ]; then
apt-get install -y git
apt-get --no-install-recommends -y install git
ansible-galaxy install -r $REQUIREMENTS
fi

Expand Down
4 changes: 2 additions & 2 deletions debian8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MAINTAINER William Yeh <[email protected]>
RUN echo "===> Installing python, sudo, and supporting tools..." && \
apt-get update -y && apt-get install --fix-missing && \
DEBIAN_FRONTEND=noninteractive \
apt-get install -y \
apt-get --no-install-recommends -y install \
python python-yaml sudo \
curl gcc python-pip python-dev libffi-dev libssl-dev && \
apt-get -y --purge remove python-cffi && \
Expand All @@ -34,7 +34,7 @@ RUN echo "===> Installing python, sudo, and supporting tools..." && \
\
\
echo "===> Installing handy tools (not absolutely required)..." && \
apt-get install -y sshpass openssh-client && \
apt-get --no-install-recommends -y install sshpass openssh-client && \
\
\
echo "===> Removing unused APT resources..." && \
Expand Down
4 changes: 2 additions & 2 deletions debian9-onbuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MAINTAINER William Yeh <[email protected]>
RUN echo "===> Installing python, sudo, and supporting tools..." && \
apt-get update -y && apt-get install --fix-missing && \
DEBIAN_FRONTEND=noninteractive \
apt-get install -y \
apt-get --no-install-recommends -y install \
python python-yaml sudo \
curl gcc python-pip python-dev libffi-dev libssl-dev && \
apt-get -y --purge remove python-cffi && \
Expand All @@ -42,7 +42,7 @@ COPY ansible-playbook-wrapper /usr/local/bin/

ONBUILD RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
echo "===> Updating TLS certificates..." && \
apt-get install -y openssl ca-certificates
apt-get --no-install-recommends -y install openssl ca-certificates

ONBUILD WORKDIR /tmp
ONBUILD COPY . /tmp
Expand Down
2 changes: 1 addition & 1 deletion debian9-onbuild/ansible-playbook-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
fi

if [ -f "$REQUIREMENTS" ]; then
apt-get install -y git
apt-get --no-install-recommends -y install git
ansible-galaxy install -r $REQUIREMENTS
fi

Expand Down
4 changes: 2 additions & 2 deletions debian9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MAINTAINER William Yeh <[email protected]>
RUN echo "===> Installing python, sudo, and supporting tools..." && \
apt-get update -y && apt-get install --fix-missing && \
DEBIAN_FRONTEND=noninteractive \
apt-get install -y \
apt-get --no-install-recommends -y install \
python python-yaml sudo \
curl gcc python-pip python-dev libffi-dev libssl-dev && \
apt-get -y --purge remove python-cffi && \
Expand All @@ -29,7 +29,7 @@ RUN echo "===> Installing python, sudo, and supporting tools..." && \
\
\
echo "===> Installing handy tools (not absolutely required)..." && \
apt-get install -y sshpass openssh-client && \
apt-get --no-install-recommends -y install sshpass openssh-client && \
\
\
echo "===> Removing unused APT resources..." && \
Expand Down
2 changes: 1 addition & 1 deletion master-debian8-onbuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ COPY ansible-playbook-wrapper /usr/local/bin/

ONBUILD RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
echo "===> Updating TLS certificates..." && \
apt-get install -y openssl ca-certificates
apt-get --no-install-recommends -y install openssl ca-certificates

ONBUILD WORKDIR /tmp
ONBUILD COPY . /tmp
Expand Down
2 changes: 1 addition & 1 deletion master-debian8-onbuild/ansible-playbook-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
fi

if [ -f "$REQUIREMENTS" ]; then
apt-get install -y git
apt-get --no-install-recommends -y install git
ansible-galaxy install -r $REQUIREMENTS
fi

Expand Down
2 changes: 1 addition & 1 deletion master-debian8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RUN echo "===> Adding Ansible's prerequisites..." && \
\
echo "===> Installing handy tools (not absolutely required)..." && \

apt-get install -y sshpass openssh-client && \
apt-get --no-install-recommends -y install sshpass openssh-client && \
\
\
echo "===> Clean up..." && \
Expand Down
2 changes: 1 addition & 1 deletion master-debian9-onbuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ COPY ansible-playbook-wrapper /usr/local/bin/

ONBUILD RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
echo "===> Updating TLS certificates..." && \
apt-get install -y openssl ca-certificates
apt-get --no-install-recommends -y install openssl ca-certificates

ONBUILD WORKDIR /tmp
ONBUILD COPY . /tmp
Expand Down
2 changes: 1 addition & 1 deletion master-debian9-onbuild/ansible-playbook-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
fi

if [ -f "$REQUIREMENTS" ]; then
apt-get install -y git
apt-get --no-install-recommends -y install git
ansible-galaxy install -r $REQUIREMENTS
fi

Expand Down
2 changes: 1 addition & 1 deletion master-debian9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ RUN echo "===> Adding Ansible's prerequisites..." && \
\
echo "===> Installing handy tools (not absolutely required)..." && \

apt-get install -y sshpass openssh-client && \
apt-get --no-install-recommends -y install sshpass openssh-client && \
\
\
echo "===> Clean up..." && \
Expand Down
2 changes: 1 addition & 1 deletion master-ubuntu16.04-onbuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ COPY ansible-playbook-wrapper /usr/local/bin/

ONBUILD RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
echo "===> Updating TLS certificates..." && \
apt-get install -y openssl ca-certificates
apt-get --no-install-recommends -y install openssl ca-certificates

ONBUILD WORKDIR /tmp
ONBUILD COPY . /tmp
Expand Down
2 changes: 1 addition & 1 deletion master-ubuntu16.04-onbuild/ansible-playbook-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
fi

if [ -f "$REQUIREMENTS" ]; then
apt-get install -y git
apt-get --no-install-recommends -y install git
ansible-galaxy install -r $REQUIREMENTS
fi

Expand Down
2 changes: 1 addition & 1 deletion master-ubuntu16.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RUN echo "===> Adding Ansible's prerequisites..." && \
\
\
echo "===> Installing handy tools (not absolutely required)..." && \
apt-get install -y sshpass openssh-client && \
apt-get --no-install-recommends -y install sshpass openssh-client && \
\
\
echo "===> Clean up..." && \
Expand Down
2 changes: 1 addition & 1 deletion master-ubuntu18.04-onbuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ COPY ansible-playbook-wrapper /usr/local/bin/

ONBUILD RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
echo "===> Updating TLS certificates..." && \
apt-get install -y openssl ca-certificates
apt-get --no-install-recommends -y install openssl ca-certificates

ONBUILD WORKDIR /tmp
ONBUILD COPY . /tmp
Expand Down
2 changes: 1 addition & 1 deletion master-ubuntu18.04-onbuild/ansible-playbook-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
fi

if [ -f "$REQUIREMENTS" ]; then
apt-get install -y git
apt-get --no-install-recommends -y install git
ansible-galaxy install -r $REQUIREMENTS
fi

Expand Down
2 changes: 1 addition & 1 deletion master-ubuntu18.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RUN echo "===> Adding Ansible's prerequisites..." && \
\
\
echo "===> Installing handy tools (not absolutely required)..." && \
apt-get install -y sshpass openssh-client && \
apt-get --no-install-recommends -y install sshpass openssh-client && \
\
\
echo "===> Clean up..." && \
Expand Down
2 changes: 1 addition & 1 deletion mini-debian8/install-ansible.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ echo "===> Adding prerequisites..."
apt-get update -y
cat ___APT_INSTALL_LIST | \
while read ITEM; do
apt-get install -y $ITEM
apt-get --no-install-recommends -y install $ITEM
done


Expand Down
4 changes: 2 additions & 2 deletions mini-debian9/install-ansible.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ echo "===> Adding prerequisites..."
apt-get update -y
cat ___APT_INSTALL_LIST | \
while read ITEM; do
apt-get install -y $ITEM
apt-get --no-install-recommends -y install $ITEM
done



echo "===> Installing Ansible..."
apt-get install -y ansible
apt-get --no-install-recommends -y install ansible



Expand Down
4 changes: 2 additions & 2 deletions ubuntu14.04-onbuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN echo "===> Adding Ansible's PPA..." && \
\
\
echo "===> Installing Ansible..." && \
apt-get install -y ansible && \
apt-get --no-install-recommends -y install ansible && \
\
\
echo "===> Removing Ansible PPA..." && \
Expand All @@ -35,7 +35,7 @@ COPY ansible-playbook-wrapper /usr/local/bin/

ONBUILD RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
echo "===> Updating TLS certificates..." && \
apt-get install -y openssl ca-certificates
apt-get --no-install-recommends -y install openssl ca-certificates

ONBUILD WORKDIR /tmp
ONBUILD COPY . /tmp
Expand Down
2 changes: 1 addition & 1 deletion ubuntu14.04-onbuild/ansible-playbook-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
fi

if [ -f "$REQUIREMENTS" ]; then
apt-get install -y git
apt-get --no-install-recommends -y install git
ansible-galaxy install -r $REQUIREMENTS
fi

Expand Down
6 changes: 3 additions & 3 deletions ubuntu14.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ RUN echo "===> Adding Ansible's PPA..." && \
\
\
echo "===> Installing Ansible..." && \
apt-get install -y ansible && \
apt-get --no-install-recommends -y install ansible && \
\
\
echo "===> Installing handy tools (not absolutely required)..." && \
#apt-get install -y python-pip && \
#apt-get --no-install-recommends -y install python-pip && \
#pip install --upgrade pywinrm && \
apt-get install -y sshpass openssh-client && \
apt-get --no-install-recommends -y install sshpass openssh-client && \
\
\
echo "===> Removing Ansible PPA..." && \
Expand Down
4 changes: 2 additions & 2 deletions ubuntu16.04-onbuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN echo "===> Adding Ansible's PPA..." && \
\
\
echo "===> Installing Ansible..." && \
apt-get install -y ansible && \
apt-get --no-install-recommends -y install ansible && \
\
\
echo "===> Removing Ansible PPA..." && \
Expand All @@ -35,7 +35,7 @@ COPY ansible-playbook-wrapper /usr/local/bin/

ONBUILD RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
echo "===> Updating TLS certificates..." && \
apt-get install -y openssl ca-certificates
apt-get --no-install-recommends -y install openssl ca-certificates

ONBUILD WORKDIR /tmp
ONBUILD COPY . /tmp
Expand Down
2 changes: 1 addition & 1 deletion ubuntu16.04-onbuild/ansible-playbook-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ -z "$REQUIREMENTS" ]; then
fi

if [ -f "$REQUIREMENTS" ]; then
apt-get install -y git
apt-get --no-install-recommends -y install git
ansible-galaxy install -r $REQUIREMENTS
fi

Expand Down
6 changes: 3 additions & 3 deletions ubuntu16.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ RUN echo "===> Adding Ansible's PPA..." && \
\
\
echo "===> Installing Ansible..." && \
apt-get install -y ansible && \
apt-get --no-install-recommends -y install ansible && \
\
\
echo "===> Installing handy tools (not absolutely required)..." && \
apt-get install -y python-pip && \
apt-get --no-install-recommends -y install python-pip && \
pip install --upgrade pycrypto pywinrm && \
apt-get install -y sshpass openssh-client && \
apt-get --no-install-recommends -y install sshpass openssh-client && \
\
\
echo "===> Removing Ansible PPA..." && \
Expand Down
Loading