From f915a6ed0ca36dde71ae56e844947bd5accb0a46 Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Thu, 6 Oct 2016 10:51:36 -0400 Subject: [PATCH 1/5] test_performance.py: use python:3 image, not ubuntu This should help reduce build times. --- tests/functional/test_performance.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/functional/test_performance.py b/tests/functional/test_performance.py index d935aec1..b410114e 100644 --- a/tests/functional/test_performance.py +++ b/tests/functional/test_performance.py @@ -2,11 +2,7 @@ import pytest import time dockerfile = u''' -FROM ubuntu:latest -RUN apt-get update -RUN apt-get install -yy python3 python3-pip python3-dev git -RUN pip3 install -U setuptools -RUN ln -s /usr/bin/pip3 /usr/bin/pip +FROM python:3 RUN adduser --disabled-password --gecos '' test ENV SEED "{seed}" WORKDIR /src @@ -42,7 +38,7 @@ def plot(proc, TIMEOUT): @pytest.mark.functional @pytest.mark.benchmark(min_rounds=10) def test_performance(spawnu, TIMEOUT, benchmark): - proc = spawnu(u'thefuck/ubuntu-python3-bash-performance', + proc = spawnu(u'thefuck/python3-bash-performance', dockerfile, u'bash') proc.sendline(u'pip install /src') proc.sendline(u'su test') From 4b79e23ba71ee596967990b6a05d6552680708ed Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Thu, 6 Oct 2016 10:56:37 -0400 Subject: [PATCH 2/5] test_bash.py: use official python images, not ubuntu This should help reduce build times. --- tests/functional/test_bash.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tests/functional/test_bash.py b/tests/functional/test_bash.py index 45496d1d..6503475b 100644 --- a/tests/functional/test_bash.py +++ b/tests/functional/test_bash.py @@ -3,18 +3,11 @@ from tests.functional.plots import with_confirmation, without_confirmation, \ refuse_with_confirmation, history_changed, history_not_changed, \ select_command_with_arrows, how_to_configure -containers = ((u'thefuck/ubuntu-python3-bash', - u'''FROM ubuntu:latest - RUN apt-get update - RUN apt-get install -yy python3 python3-pip python3-dev git - RUN pip3 install -U setuptools - RUN ln -s /usr/bin/pip3 /usr/bin/pip''', +containers = ((u'thefuck/python3-bash', + u'FROM python:3', u'bash'), - (u'thefuck/ubuntu-python2-bash', - u'''FROM ubuntu:latest - RUN apt-get update - RUN apt-get install -yy python python-pip python-dev git - RUN pip2 install -U pip setuptools''', + (u'thefuck/python2-bash', + u'FROM python:2', u'bash')) From 91fceb401acd504bfb0f3c49f56f1f89e1a9f547 Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Thu, 6 Oct 2016 10:59:33 -0400 Subject: [PATCH 3/5] test_fish.py: use official python images, not ubuntu This should help reduce build times. --- tests/functional/test_fish.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/functional/test_fish.py b/tests/functional/test_fish.py index aec038a4..657ebf19 100644 --- a/tests/functional/test_fish.py +++ b/tests/functional/test_fish.py @@ -2,19 +2,20 @@ import pytest from tests.functional.plots import with_confirmation, without_confirmation, \ refuse_with_confirmation, select_command_with_arrows -containers = (('thefuck/ubuntu-python3-fish', - u'''FROM ubuntu:latest +containers = (('thefuck/python3-fish', + u'''FROM python:3 + # Use jessie-backports since it has the fish package. See here for details: + # https://github.com/tianon/docker-brew-debian/blob/88ae21052affd8a14553bb969f9d41c464032122/jessie/backports/Dockerfile + RUN awk '$1 ~ "^deb" { $3 = $3 "-backports"; print; exit }' /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list RUN apt-get update - RUN apt-get install -yy python3 python3-pip python3-dev fish git - RUN pip3 install -U setuptools - RUN ln -s /usr/bin/pip3 /usr/bin/pip RUN apt-get install -yy fish''', u'fish'), - ('thefuck/ubuntu-python2-fish', - u'''FROM ubuntu:latest + ('thefuck/python2-fish', + u'''FROM python:2 + # Use jessie-backports since it has the fish package. See here for details: + # https://github.com/tianon/docker-brew-debian/blob/88ae21052affd8a14553bb969f9d41c464032122/jessie/backports/Dockerfile + RUN awk '$1 ~ "^deb" { $3 = $3 "-backports"; print; exit }' /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list RUN apt-get update - RUN apt-get install -yy python python-pip python-dev git - RUN pip2 install -U pip setuptools RUN apt-get install -yy fish''', u'fish')) From 10b20574d1f462ed9487f429fcea43136ac77803 Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Thu, 6 Oct 2016 11:12:36 -0400 Subject: [PATCH 4/5] test_tcsh.py: use official python images, not ubuntu This should help reduce build times. --- tests/functional/test_tcsh.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/functional/test_tcsh.py b/tests/functional/test_tcsh.py index e7d621b5..12cabe30 100644 --- a/tests/functional/test_tcsh.py +++ b/tests/functional/test_tcsh.py @@ -2,19 +2,14 @@ import pytest from tests.functional.plots import with_confirmation, without_confirmation, \ refuse_with_confirmation, select_command_with_arrows -containers = (('thefuck/ubuntu-python3-tcsh', - u'''FROM ubuntu:latest +containers = (('thefuck/python3-tcsh', + u'''FROM python:3 RUN apt-get update - RUN apt-get install -yy python3 python3-pip python3-dev git - RUN pip3 install -U setuptools - RUN ln -s /usr/bin/pip3 /usr/bin/pip RUN apt-get install -yy tcsh''', u'tcsh'), - ('thefuck/ubuntu-python2-tcsh', - u'''FROM ubuntu:latest + ('thefuck/python2-tcsh', + u'''FROM python:2 RUN apt-get update - RUN apt-get install -yy python python-pip python-dev git - RUN pip2 install -U pip setuptools RUN apt-get install -yy tcsh''', u'tcsh')) From 16a440cb9d3476b71e9e7ebd975a16ee609159f5 Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Thu, 6 Oct 2016 11:15:16 -0400 Subject: [PATCH 5/5] test_zsh.py: use official python images, not ubuntu This should help reduce build times. --- tests/functional/test_zsh.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/functional/test_zsh.py b/tests/functional/test_zsh.py index 6c12a3d2..7e2d78d0 100644 --- a/tests/functional/test_zsh.py +++ b/tests/functional/test_zsh.py @@ -3,19 +3,14 @@ from tests.functional.plots import with_confirmation, without_confirmation, \ refuse_with_confirmation, history_changed, history_not_changed, \ select_command_with_arrows, how_to_configure -containers = (('thefuck/ubuntu-python3-zsh', - u'''FROM ubuntu:latest +containers = (('thefuck/python3-zsh', + u'''FROM python:3 RUN apt-get update - RUN apt-get install -yy python3 python3-pip python3-dev git - RUN pip3 install -U setuptools - RUN ln -s /usr/bin/pip3 /usr/bin/pip RUN apt-get install -yy zsh''', u'zsh'), - ('thefuck/ubuntu-python2-zsh', - u'''FROM ubuntu:latest + ('thefuck/python2-zsh', + u'''FROM python:2 RUN apt-get update - RUN apt-get install -yy python python-pip python-dev git - RUN pip2 install -U pip setuptools RUN apt-get install -yy zsh''', u'zsh'))