From 99e9d3291850583ab2caca14e9f08591d2823780 Mon Sep 17 00:00:00 2001 From: Rodrigue Date: Tue, 22 May 2018 18:22:27 +0200 Subject: [PATCH 1/3] Update dockerfile --- Dockerfile-python3 | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile-python3 b/Dockerfile-python3 index fbb3409..2716556 100644 --- a/Dockerfile-python3 +++ b/Dockerfile-python3 @@ -2,6 +2,7 @@ FROM python:3.6 RUN apt-get update && apt-get install -y \ vim \ + awscli \ jq WORKDIR /aws-amicleaner From 63aaf4af314df993bb98369f06512768a1b99778 Mon Sep 17 00:00:00 2001 From: Rodrigue Date: Tue, 22 May 2018 19:06:51 +0200 Subject: [PATCH 2/3] Set default dockerfile to python3 --- Dockerfile | 17 +++++++++++------ Dockerfile-python2 | 9 +++++++++ Dockerfile-python3 | 14 -------------- 3 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 Dockerfile-python2 delete mode 100644 Dockerfile-python3 diff --git a/Dockerfile b/Dockerfile index 36b965f..219f565 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,14 @@ -FROM python:2.7 +FROM python:3.6 -WORKDIR /aws-amicleaner - -ADD . . +RUN apt-get update && apt-get install -y \ + vim \ + awscli \ + twine \ + jq -RUN pip install -r requirements.txt +ENV PATH="${PATH}:/root/.local/bin/" -CMD amicleaner/cli.py -h +WORKDIR /aws-amicleaner +ADD . . +RUN python setup.py install +CMD bash diff --git a/Dockerfile-python2 b/Dockerfile-python2 new file mode 100644 index 0000000..36b965f --- /dev/null +++ b/Dockerfile-python2 @@ -0,0 +1,9 @@ +FROM python:2.7 + +WORKDIR /aws-amicleaner + +ADD . . + +RUN pip install -r requirements.txt + +CMD amicleaner/cli.py -h diff --git a/Dockerfile-python3 b/Dockerfile-python3 deleted file mode 100644 index 2716556..0000000 --- a/Dockerfile-python3 +++ /dev/null @@ -1,14 +0,0 @@ -FROM python:3.6 - -RUN apt-get update && apt-get install -y \ - vim \ - awscli \ - jq - -WORKDIR /aws-amicleaner - -ADD . . - -RUN python setup.py install - -CMD bash From 6f6f34cbcb17e32c505fdcea2fda850768e333e2 Mon Sep 17 00:00:00 2001 From: Rodrigue Date: Tue, 22 May 2018 19:08:32 +0200 Subject: [PATCH 3/3] Release 0.2.2 --- amicleaner/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amicleaner/__init__.py b/amicleaner/__init__.py index 1ce92da..d7b2007 100644 --- a/amicleaner/__init__.py +++ b/amicleaner/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- __title__ = 'amicleaner' -__version__ = '0.2.0' +__version__ = '0.2.2' __short_version__ = '.'.join(__version__.split('.')[:2]) __author__ = 'Guy Rodrigue Koffi' __author_email__ = 'koffirodrigue@gmail.com'