Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
talset authored Nov 1, 2018
2 parents 92433aa + c451cb6 commit 60b9227
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
import re

import boto3
import requests
try:
import requests
except ImportError:
from botocore.vendored import requests

REGION = None
DRYRUN = None
Expand Down Expand Up @@ -206,7 +209,7 @@ def delete_images(ecr_client, deletesha, deletetag, id, name):
parser.add_argument('-region', help='ECR/ECS region', default=os.environ.get('REGION', "None"), action='store', dest='region')
parser.add_argument('-repositories', help='Filter for repositories names discovery separated by space', default=os.environ.get('REPOSITORIES_FILTER', "").split(),
nargs='+', action='store', dest='repositories_filter')
parser.add_argument('-ignoretagsregex', help='Regex of tag names to ignore', default=os.environ.get('IGNORE_TAGS_REGEX', ""), action='store', dest='ignoretagsregex')
parser.add_argument('-ignoretagsregex', help='Regex of tag names to ignore', default=os.environ.get('IGNORE_TAGS_REGEX', "^$"), action='store', dest='ignoretagsregex')
parser.add_argument('-filtertagsregex', help='Regex filter of tag names to limit on images with matching tag', default=os.environ.get('FILTER_TAGS_REGEX', ""), action='store', dest='filtertagsregex')

args = parser.parse_args()
Expand Down

0 comments on commit 60b9227

Please sign in to comment.