diff options
| -rw-r--r-- | .idea/workspace.xml | 57 | ||||
| -rw-r--r-- | deliveries/os_docker_push.sh | 19 |
2 files changed, 40 insertions, 36 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 02573872..55e8bfdf 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,11 +2,6 @@ <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/configure-and-run.sh" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/deliveries/os_Dockerfile" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/deliveries/os_build_febe.sh" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/deliveries/os_docker_push.sh" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/deliveries/run.sh" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -39,27 +34,27 @@ <entry file="file://$PROJECT_DIR$/deliveries/configure-and-run.sh"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="17"> - <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> + <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="os_build_febe.sh" pinned="false" current-in-tab="true"> + <file leaf-file-name="os_build_febe.sh" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/deliveries/os_build_febe.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="228"> - <caret line="54" column="14" lean-forward="false" selection-start-line="54" selection-start-column="14" selection-end-line="54" selection-end-column="14" /> + <state relative-caret-position="986"> + <caret line="58" column="6" lean-forward="false" selection-start-line="58" selection-start-column="6" selection-end-line="58" selection-end-column="6" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="os_docker_push.sh" pinned="false" current-in-tab="false"> + <file leaf-file-name="os_docker_push.sh" pinned="false" current-in-tab="true"> <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="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" /> + <state relative-caret-position="51"> + <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> <folding /> </state> </provider> @@ -88,8 +83,8 @@ <file leaf-file-name="run.sh" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/deliveries/run.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="51"> - <caret line="3" column="16" lean-forward="false" selection-start-line="3" selection-start-column="16" selection-end-line="3" selection-end-column="16" /> + <state relative-caret-position="68"> + <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> <folding /> </state> </provider> @@ -131,9 +126,9 @@ <option value="$PROJECT_DIR$/ecomp-portal-BE/pom.xml" /> <option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/deliveries/configure-and-run.sh" /> - <option value="$PROJECT_DIR$/deliveries/os_docker_push.sh" /> <option value="$PROJECT_DIR$/deliveries/run.sh" /> <option value="$PROJECT_DIR$/deliveries/os_build_febe.sh" /> + <option value="$PROJECT_DIR$/deliveries/os_docker_push.sh" /> </list> </option> </component> @@ -431,7 +426,7 @@ </component> <component name="ToolWindowManager"> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> - <editor active="true" /> + <editor active="false" /> <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" /> @@ -445,7 +440,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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29144096" sideWeight="0.5" order="7" 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.29144096" 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.25799572" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> @@ -551,15 +546,7 @@ <entry file="file://$PROJECT_DIR$/deliveries/configure-and-run.sh"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="17"> - <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> - <folding /> - </state> - </provider> - </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="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" /> + <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> <folding /> </state> </provider> @@ -580,18 +567,26 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/deliveries/os_build_febe.sh"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="986"> + <caret line="58" column="6" lean-forward="false" selection-start-line="58" selection-start-column="6" selection-end-line="58" selection-end-column="6" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/deliveries/run.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="51"> - <caret line="3" column="16" lean-forward="false" selection-start-line="3" selection-start-column="16" selection-end-line="3" selection-end-column="16" /> + <state relative-caret-position="68"> + <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/deliveries/os_build_febe.sh"> + <entry file="file://$PROJECT_DIR$/deliveries/os_docker_push.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="228"> - <caret line="54" column="14" lean-forward="false" selection-start-line="54" selection-start-column="14" selection-end-line="54" selection-end-column="14" /> + <state relative-caret-position="51"> + <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> <folding /> </state> </provider> diff --git a/deliveries/os_docker_push.sh b/deliveries/os_docker_push.sh index a58f5aae..e19a360a 100644 --- a/deliveries/os_docker_push.sh +++ b/deliveries/os_docker_push.sh @@ -1,7 +1,16 @@ #!/bin/bash -#docker login -docker tag ep:1610-1 portalapps:1.0.0 -docker tag ecompdb:portal portaldb:1.0.0 -docker push portalapps:1.0.0 -docker push portaldb:1.0.0
\ No newline at end of file +REPO="nexus3.openecomp.org:10003" + +APPS="${REPO}/openecomp/portalapps:1.0.0" +DB="${REPO}/openecomp/portaldb:1.0.0" + +# docker login nexus3.openecomp.org:10003 + +# tag +docker tag ep:1610-1 ${APPS} +docker tag ecompdb:portal ${DB} + +# push +docker push ${APPS} +docker push ${DB}
\ No newline at end of file |