added requirements.txt and proper version tagging

cgswong · Feb 10, 2019 · fa04b60 · fa04b60
1 parent 2da18f0
commit fa04b60
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,6 @@ jobs:
     machine: true
     environment:
       APP_NAME: aws
-      APP_VERSION: 1.16.39
     steps:
       - checkout
       - run:
@@ -18,11 +17,11 @@ jobs:
       - run:
           name: Build image
           command: |
-            docker build -t cgswong/${APP_NAME}:${APP_VERSION} .
+            docker build -t cgswong/${APP_NAME}:latest .
       - run:
           name: Test version
           command: |
-            docker run cgswong/${APP_NAME}:${APP_VERSION} aws --version
+            docker run cgswong/${APP_NAME}:latest aws --version
       - save_cache:
           key: docker-cache-{{ .Environment.CIRCLE_SHA1 }}
           paths:
@@ -31,15 +30,17 @@ jobs:
     machine: true
     environment:
       APP_NAME: aws
-      APP_VERSION: 1.16.39
     steps:
       - checkout
       - deploy:
           command: |
-            docker build -t cgswong/${APP_NAME}:${APP_VERSION} .
+            docker build -t cgswong/${APP_NAME}:latest .
+            export AWSCLI_VERSION=$(docker run cswong/${APP_NAME}:latest aws --version | cut -d"/" -f2 | cut -d" " -f1)
+            docker build --cache-from cgswong/${APP_NAME}:latest -t cgswong/${APP_NAME}:${AWSCLI_VERSION} .
             echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin
-            if [  "$CIRCLE_BRANCH" = "master" ]; then 
-              docker push cgswong/${APP_NAME}:${APP_VERSION}
+            if [  "$CIRCLE_BRANCH" = "master" ]; then
+              docker push cgswong/${APP_NAME}:latest
+              docker push cgswong/${APP_NAME}:${AWSCLI_VERSION}
             else
               echo "Not on master branch, will not deploy to Docker Hub"
             fi

diff --git a/Dockerfile b/Dockerfile
@@ -13,6 +13,8 @@ ENV PAGER more
 
 WORKDIR /tmp
 
+ADD requirements.txt
+
 RUN apk --no-cache add \
       bash \
       bash-completion \
@@ -27,12 +29,12 @@ RUN apk --no-cache add \
     pip install --upgrade --no-cache-dir \
       pip \
       setuptools &&\
-    pip install --upgrade --no-cache-dir \
-      awscli \
+    pip install --no-cache-dir \
       python-dateutil &&\
+    pip install -r requirements.txt --no-cache-dir &&\
     ln -s /usr/bin/aws_bash_completer /etc/profile.d/aws_bash_completer.sh &&\
     curl -sSL --output ${S3_TMP} https://github.com/s3tools/s3cmd/archive/master.zip &&\
-    curl -sSL --output ${RDS_TMP} https://s3.amazonaws.com/rds-downloads/RDSCli.zip &&\
+    curl -sSL --output ${RDS_TMP} https://s3.amazonaws.com/rds-downloads/RDSCli-${RDS_VERSION}.zip &&\
     unzip -q ${S3_TMP} -d /tmp &&\
     unzip -q ${RDS_TMP} -d /tmp &&\
     mv ${S3_ZIP}/S3 ${S3_ZIP}/s3cmd /usr/bin/ &&\

diff --git a/release.md b/release.md
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1 @@
+awscli==1.16.101