Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into develop

.gitlab-ci.yml

@@ -10,17 +10,6 @@ stages:
   - docker
   - demo
 
-build:
-  image: docker:stable
-  stage: build
-  script:
-    - docker version
-    - docker build -t $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA .
-    - if [ -z "$DOCKERHUB_USERNAME" ] || [ -z "$DOCKERHUB_PASSWORD" ]; then echo "Not pushing" && exit 0; fi
-    - docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
-    - echo "Ignore warning! Cannot perform an interactive login from a non TTY device"
-    - docker push $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
-
 build-aws:
   image: docker:stable
   stage: build
@@ -30,11 +19,22 @@ build-aws:
     - apk add --no-cache curl jq python py-pip
     - pip install awscli
   script:
-    - $(aws ecr get-login --no-include-email --region us-east-1)
+    - eval $(aws ecr get-login --no-include-email --region eu-west-1 | sed 's|https://||')
     - docker build -t $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA .
     - docker tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA $REPOSITORY_URL:latest
     - docker push $REPOSITORY_URL:latest
 
+build:
+  image: docker:stable
+  stage: build
+  script:
+    - docker version
+    - docker build -t $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA .
+    - if [ -z "$DOCKERHUB_USERNAME" ] || [ -z "$DOCKERHUB_PASSWORD" ]; then echo "Not pushing" && exit 0; fi
+    - docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
+    - echo "Ignore warning! Cannot perform an interactive login from a non TTY device"
+    - docker push $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
+
 lint:
   image: $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
   stage: test