v0.2.14

opspresso · Mar 15, 2021 · 2774e04 · 2774e04
1 parent 51af6f1
commit 2774e04
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ LABEL "com.github.actions.description"="build, tag and pushes the container"
 LABEL "com.github.actions.icon"="anchor"
 LABEL "com.github.actions.color"="blue"
 
-LABEL version=v0.2.13
+LABEL version=v0.2.14
 LABEL repository="https://github.com/opspresso/action-docker"
 LABEL maintainer="Jungyoul Yu <me@nalbam.com>"
 LABEL homepage="https://opspresso.com/"

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.2.13
+v0.2.14
diff --git a/action.yml b/action.yml
@@ -8,7 +8,7 @@ branding:
 
 runs:
   using: docker
-  image: docker://opspresso/action-docker:v0.2.13
+  image: docker://opspresso/action-docker:v0.2.14
 
 outputs:
   TAG_NAME:

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -167,8 +167,14 @@ ${AWS_REGION}
 text
 EOF
 
-  echo "aws ecr get-login --no-include-email"
-  aws ecr get-login --no-include-email | sh
+  # https://docs.aws.amazon.com/cli/latest/reference/ecr/get-login.html
+  # echo "aws ecr get-login --no-include-email"
+  # aws ecr get-login --no-include-email | sh
+
+  ACCOUNT_ID=$(aws sts get-caller-identity | jq .Account -r)
+
+  echo "aws ecr get-login-password ${ACCOUNT_ID} ${AWS_REGION}"
+  aws ecr get-login-password --region ${AWS_REGION} | docker login --username AWS --password-stdin ${ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/
 
   _error_check