From 247a7a4ef3ad4e7101a4060b1e1843cc8f3d5ffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Hedenstr=C3=B6m?= <erik@hedenstroem.com>
Date: Thu, 2 Apr 2020 21:07:18 +0200
Subject: [PATCH] Added step to get credentials

---
 .gitlab-ci.yml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89ef929..f0f5494 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,17 +26,29 @@ stages:
     paths:
       - $CI_PROJECT_NAME-$CI_JOB_NAME
 
+aws credentials:
+  stage: upload
+#  only:
+#    - /^\d+[.]\d+[.]\d+$/
+  script:
+    - mkdir $HOME/.aws
+    - vaultenv download secret/gitlab-ci/s3_credentials $HOME/.aws/credentials
+    - vaultenv download secret/gitlab-ci/s3_confic $HOME/.aws/config
+    - pwd
+    - echo $HOME
+
 upload to s3:
   image: amazon/aws-cli
   stage: upload
-  only:
-    - /^\d+[.]\d+[.]\d+$/
+#  only:
+#    - /^\d+[.]\d+[.]\d+$/
   script:
     - git describe --tags --long > $CI_PROJECT_NAME-version.txt
-    - eval $(vaultenv read -s secret/gitlab-ci/s3)
-    - aws s3 cp . s3://s3.hedenstroem.com/utils/$CI_PROJECT_NAME/ --recursive --exclude="*" --include="$CI_PROJECT_NAME-*"
-    - aws configure set preview.cloudfront true
-    - aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths "/utils/$CI_PROJECT_NAME/*"
+    - ls -l $HOME
+    - pwd
+#    - aws s3 cp . s3://s3.hedenstroem.com/utils/$CI_PROJECT_NAME/ --recursive --exclude="*" --include="$CI_PROJECT_NAME-*"
+#    - aws configure set preview.cloudfront true
+#    - aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths "/utils/$CI_PROJECT_NAME/*"
 
 gitlab-builder-base:
   stage: deps
-- 
GitLab