From: talasila <talasila@research.att.com>
Date: Wed, 22 Feb 2017 17:03:21 +0000 (-0500)
Subject: latest version is added to docker
X-Git-Tag: v1.3.0~80
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=commitdiff_plain;h=1ba915bb1d5d94320278718e014737ade8ff6750

latest version is added to docker

Change-Id: I4ed035a361fce3fa80d839e711d313d8e3450d1e
Signed-off-by: talasila <talasila@research.att.com>
---

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e7aba6c1..25a0f081 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="9f8fedf4-4e3c-46d3-845e-c0f9aba359d6" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/deliveries/os_docker_release.sh" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/deliveries/os_docker_push.sh" afterPath="$PROJECT_DIR$/deliveries/os_docker_push.sh" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/deliveries/os_docker_release.sh" afterPath="$PROJECT_DIR$/deliveries/os_docker_release.sh" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -44,8 +44,8 @@
       <file leaf-file-name="os_docker_push.sh" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/deliveries/os_docker_push.sh">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="34">
-              <caret line="2" column="8" lean-forward="false" selection-start-line="2" selection-start-column="8" selection-end-line="2" selection-end-column="8" />
+            <state relative-caret-position="136">
+              <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -54,8 +54,8 @@
       <file leaf-file-name="os_docker_release.sh" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/deliveries/os_docker_release.sh">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="289">
-              <caret line="17" column="17" lean-forward="false" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+            <state relative-caret-position="425">
+              <caret line="25" column="24" lean-forward="false" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" />
               <folding />
             </state>
           </provider>
@@ -496,7 +496,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1616" height="1176" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -510,7 +510,7 @@
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25790986" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25790986" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3206941" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -904,16 +904,16 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/deliveries/os_docker_push.sh">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="8" lean-forward="false" selection-start-line="2" selection-start-column="8" selection-end-line="2" selection-end-column="8" />
+        <state relative-caret-position="136">
+          <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/deliveries/os_docker_release.sh">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="17" column="17" lean-forward="false" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+        <state relative-caret-position="425">
+          <caret line="25" column="24" lean-forward="false" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" />
           <folding />
         </state>
       </provider>
diff --git a/deliveries/os_docker_push.sh b/deliveries/os_docker_push.sh
index 40d15cb5..165d05d6 100644
--- a/deliveries/os_docker_push.sh
+++ b/deliveries/os_docker_push.sh
@@ -4,15 +4,23 @@
 
 REPO="nexus3.openecomp.org:10003"
 
-APPS="${REPO}/openecomp/portalapps:1.0.0"
-DB="${REPO}/openecomp/portaldb:1.0.0"
+VERSION="1.0.0"
+LATEST="latest"
 
-# docker login nexus3.openecomp.org:10003
+APPS_VERSION="${REPO}/openecomp/portalapps:${VERSION}"
+DB_VERSION="${REPO}/openecomp/portaldb:${VERSION}"
 
-# tag
-docker tag ep:1610-1 ${APPS}
-docker tag ecompdb:portal ${DB}
+APPS_LATEST="${REPO}/openecomp/portalapps:${LATEST}"
+DB_LATEST="${REPO}/openecomp/portaldb:${LATEST}"
+
+# tag version
+docker tag ep:1610-1 ${APPS_VERSION}
+docker tag ecompdb:portal ${DB_VERSION}
+docker tag ep:1610-1 ${APPS_LATEST}
+docker tag ecompdb:portal ${DB_LATEST}
 
 # push
-docker push ${APPS}
-docker push ${DB}
\ No newline at end of file
+docker push ${APPS_VERSION}
+docker push ${DB_VERSION}
+docker push ${APPS_LATEST}
+docker push ${DB_LATEST}
\ No newline at end of file
diff --git a/deliveries/os_docker_release.sh b/deliveries/os_docker_release.sh
index 6bcbfb66..95b1c80b 100644
--- a/deliveries/os_docker_release.sh
+++ b/deliveries/os_docker_release.sh
@@ -4,15 +4,23 @@
 
 REPO="nexus3.openecomp.org:10002"
 
-APPS="${REPO}/openecomp/portalapps:1.0.0"
-DB="${REPO}/openecomp/portaldb:1.0.0"
+VERSION="1.0.0"
+LATEST="latest"
 
-# docker login nexus3.openecomp.org:10002
+APPS_VERSION="${REPO}/openecomp/portalapps:${VERSION}"
+DB_VERSION="${REPO}/openecomp/portaldb:${VERSION}"
 
-# tag
-docker tag ep:1610-1 ${APPS}
-docker tag ecompdb:portal ${DB}
+APPS_LATEST="${REPO}/openecomp/portalapps:${LATEST}"
+DB_LATEST="${REPO}/openecomp/portaldb:${LATEST}"
+
+# tag version
+docker tag ep:1610-1 ${APPS_VERSION}
+docker tag ecompdb:portal ${DB_VERSION}
+docker tag ep:1610-1 ${APPS_LATEST}
+docker tag ecompdb:portal ${DB_LATEST}
 
 # push
-docker push ${APPS}
-docker push ${DB}
\ No newline at end of file
+docker push ${APPS_VERSION}
+docker push ${DB_VERSION}
+docker push ${APPS_LATEST}
+docker push ${DB_LATEST}
\ No newline at end of file