Merge pull request #5 from probr/feature/eks

Corrected AWS credential handling to happen in entrypoint

Dockerfile

@@ -21,13 +21,10 @@ COPY . .
 ARG VERSION_PROBR=v0.1.2
 ARG VERSION_K8S=v0.1.1
 ARG VERSION_AKS=v0.1.0
-ARG AWS_ACCESS_KEY_ID=
-ARG AWS_SECRET_ACCESS_KEY=
 
-RUN mkdir ~/.aws && \
-    echo "[default]" >> ~/.aws/credentials && \
-    echo "aws_access_key_id=${AWS_ACCESS_KEY_ID}" >> ~/.aws/credentials && \
-    echo "aws_secret_access_key=${AWS_SECRET_ACCESS_KEY}" >> ~/.aws/credentials
+# Env vars may be passed in at runtime
+ENV AWS_ACCESS_KEY_ID=
+ENV AWS_SECRET_ACCESS_KEY=
 
 RUN make probr VERSION=${VERSION_PROBR} && \
     mv /probr/cmd/bin/probr /probr/cmd/probr
@@ -42,4 +39,4 @@ ENV PROBR_WRITE_DIRECTORY /probr/run
 # Service packs may be overridden for debugging by mounting to /probr/cmd/bin
 # Entrypoint may be overridden by mounting to /probr/entrypoint.sh
 WORKDIR /probr/run
-ENTRYPOINT ["/probr/cmd/probr"]
+ENTRYPOINT ["entrypoint.sh"]

entrypoint.sh

@@ -0,0 +1,8 @@
+# If using AWS, credentials are required
+# If not using AWS, this has no effect
+mkdir ~/.aws
+echo "[default]" >> ~/.aws/credentials
+echo "aws_access_key_id=${AWS_ACCESS_KEY_ID}" >> ~/.aws/credentials
+echo "aws_secret_access_key=${AWS_SECRET_ACCESS_KEY}" >> ~/.aws/credentials
+
+/probr/cmd/probr