yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 6d6594c7f044abdbd7a7b5718a7c15755457735f 1 parent 5b453b17

docker

Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
@@ -62,8 +62,8 @@ @@ -62,8 +62,8 @@
62 <file leaf-file-name="awsdeploy.sh" pinned="false" current-in-tab="true"> 62 <file leaf-file-name="awsdeploy.sh" pinned="false" current-in-tab="true">
63 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh"> 63 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh">
64 <provider selected="true" editor-type-id="text-editor"> 64 <provider selected="true" editor-type-id="text-editor">
65 - <state relative-caret-position="162">  
66 - <caret line="12" column="19" lean-forward="true" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" /> 65 + <state relative-caret-position="135">
  66 + <caret line="14" column="49" lean-forward="false" selection-start-line="14" selection-start-column="49" selection-end-line="14" selection-end-column="49" />
67 <folding /> 67 <folding />
68 </state> 68 </state>
69 </provider> 69 </provider>
@@ -656,12 +656,12 @@ @@ -656,12 +656,12 @@
656 <updated>1545890692513</updated> 656 <updated>1545890692513</updated>
657 <workItem from="1545890694011" duration="11746000" /> 657 <workItem from="1545890694011" duration="11746000" />
658 <workItem from="1545905663805" duration="1370000" /> 658 <workItem from="1545905663805" duration="1370000" />
659 - <workItem from="1545965888175" duration="18388000" /> 659 + <workItem from="1545965888175" duration="18937000" />
660 </task> 660 </task>
661 <servers /> 661 <servers />
662 </component> 662 </component>
663 <component name="TimeTrackingManager"> 663 <component name="TimeTrackingManager">
664 - <option name="totallyTimeSpent" value="31504000" /> 664 + <option name="totallyTimeSpent" value="32053000" />
665 </component> 665 </component>
666 <component name="ToolWindowManager"> 666 <component name="ToolWindowManager">
667 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> 667 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -868,8 +868,8 @@ @@ -868,8 +868,8 @@
868 </entry> 868 </entry>
869 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh"> 869 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh">
870 <provider selected="true" editor-type-id="text-editor"> 870 <provider selected="true" editor-type-id="text-editor">
871 - <state relative-caret-position="162">  
872 - <caret line="12" column="19" lean-forward="true" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" /> 871 + <state relative-caret-position="135">
  872 + <caret line="14" column="49" lean-forward="false" selection-start-line="14" selection-start-column="49" selection-end-line="14" selection-end-column="49" />
873 <folding /> 873 <folding />
874 </state> 874 </state>
875 </provider> 875 </provider>
@@ -10,9 +10,9 @@ CLUSTER=web @@ -10,9 +10,9 @@ CLUSTER=web
10 #SERVICE_NAME=$1 10 #SERVICE_NAME=$1
11 11
12 templatefile=${WORKSPACE}/Docker-Image-Deplopy/aws/${SERVICE_NAME}-template.json 12 templatefile=${WORKSPACE}/Docker-Image-Deplopy/aws/${SERVICE_NAME}-template.json
13 -echo "templatefile" 13 +echo "$templatefile"
14 #Replace the build number and respository URI placeholders with the constants above 14 #Replace the build number and respository URI placeholders with the constants above
15 -sed -e "s;%IMAGE_VERSION%;${REPOSITORY_NAME};g" templatefile > ${SERVICE_NAME}-v_${BUILD_NUMBER}.json 15 +sed -e "s;%IMAGE_VERSION%;${REPOSITORY_NAME};g" $templatefile > ${SERVICE_NAME}-v_${BUILD_NUMBER}.json
16 #Register the task definition in the repository 16 #Register the task definition in the repository
17 aws ecs register-task-definition --family ${SERVICE_NAME} --cli-input-json file://${WORKSPACE}/${SERVICE_NAME}-v_${BUILD_NUMBER}.json --region ${REGION} 17 aws ecs register-task-definition --family ${SERVICE_NAME} --cli-input-json file://${WORKSPACE}/${SERVICE_NAME}-v_${BUILD_NUMBER}.json --region ${REGION}
18 SERVICES=`aws ecs describe-services --services ${SERVICE_NAME} --cluster ${CLUSTER} --region ${REGION} | jq .failures[]` 18 SERVICES=`aws ecs describe-services --services ${SERVICE_NAME} --cluster ${CLUSTER} --region ${REGION} | jq .failures[]`