Merge pull request codeship-library#46 from codeship-library/updates

mlocher · web-flow · commit 5d31f19877e7 · 2017-08-08T16:22:48.000+02:00
Updates to AWS CLI v1.11.129
diff --git a/base/Dockerfile b/base/Dockerfile
@@ -1,9 +1,9 @@
 FROM python:3.6-alpine
-MAINTAINER maintainers@codeship.com
+LABEL maintainer='Codeship Inc., <maintainers@codeship.com>'
 
 # which version of the AWS CLI to install.
 # https://pypi.python.org/pypi/awscli
-ARG AWS_CLI_VERSION="1.11.97"
+ARG AWS_CLI_VERSION="1.11.129"
 
 ENV PIP_DISABLE_PIP_VERSION_CHECK=true
 
diff --git a/deployment/Dockerfile b/deployment/Dockerfile
@@ -1,5 +1,5 @@
 FROM codeship/aws-base:latest
-MAINTAINER maintainers@codeship.com
+LABEL maintainer='Codeship Inc., <maintainers@codeship.com>'
 
 RUN \
   apk --no-cache add \
diff --git a/dockercfg-generator/Dockerfile b/dockercfg-generator/Dockerfile
@@ -1,5 +1,5 @@
 FROM codeship/aws-base:latest
-MAINTAINER maintainers@codeship.com
+LABEL maintainer='Codeship Inc., <maintainers@codeship.com>'
 
 RUN \
   apk --no-cache add \
diff --git a/dockercfg-generator/Dockerfile.test b/dockercfg-generator/Dockerfile.test
@@ -1,5 +1,5 @@
-FROM alpine:3.4
-MAINTAINER maintainers@codeship.com
+FROM alpine:3.6
+LABEL maintainer='Codeship Inc., <maintainers@codeship.com>'
 
 RUN \
   echo "Hello ECR at $(date)" > hello.txt && \

-Original file line number
+Diff line change
 FROM codeship/aws-base:latest
 -MAINTAINER [email protected]
 +LABEL maintainer='Codeship Inc., <[email protected]>'
 RUN \
   apk --no-cache add \