Skip to content

C
cloudl
Commit 6d1a8fac authored by kavinduchamiran's avatar kavinduchamiran
Browse files
Options

fix1

parent 84df3758
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 36 deletions
.dockerignore
View file @ 6d1a8fac
...@@ -24,3 +24,5 @@ yarn-error.log* ...@@ -24,3 +24,5 @@ yarn-error.log*
/public/env-config.js /public/env-config.js
env-config.js env-config.js
.idea
\ No newline at end of file
.gitignore
View file @ 6d1a8fac
...@@ -24,3 +24,5 @@ yarn-error.log* ...@@ -24,3 +24,5 @@ yarn-error.log*
/public/env-config.js /public/env-config.js
env-config.js env-config.js
.idea
.gitlab-ci.yml
View file @ 6d1a8fac
...@@ -18,6 +18,8 @@ docker_build: ...@@ -18,6 +18,8 @@ docker_build:
- cloudl-client - cloudl-client
script: script:
- echo ${DOCKER_USERNAME}
- echo ${DOCKER_PASSWORD}
- docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD} - docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}
- docker build -t ${CONTAINER_IMAGE} . - docker build -t ${CONTAINER_IMAGE} .
- docker tag ${CONTAINER_IMAGE} kavinduchamiran/${CI_COMMIT_REF_NAME}:latest - docker tag ${CONTAINER_IMAGE} kavinduchamiran/${CI_COMMIT_REF_NAME}:latest
......
.idea/workspace.xml
View file @ 6d1a8fac
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="551482e6-244f-4c3b-88fb-c0b9773ab236" name="Default Changelist" comment="" /> <list default="true" id="551482e6-244f-4c3b-88fb-c0b9773ab236" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.dockerignore" beforeDir="false" afterPath="$PROJECT_DIR$/.dockerignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" /> <ignored path="$PROJECT_DIR$/tmp/" />
...@@ -34,8 +37,8 @@ ...@@ -34,8 +37,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/utils/webSocket.js"> <entry file="file://$PROJECT_DIR$/src/utils/webSocket.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15"> <state relative-caret-position="60">
<caret line="1" selection-start-line="1" selection-end-line="1" /> <caret line="4" column="22" lean-forward="true" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -53,10 +56,19 @@ ...@@ -53,10 +56,19 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="487">
<caret line="39" column="55" selection-start-line="39" selection-start-column="55" selection-end-line="39" selection-end-column="55" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/k8s/cloudl-client-deployment.yml"> <entry file="file://$PROJECT_DIR$/k8s/cloudl-client-deployment.yml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="165">
<caret line="19" column="24" lean-forward="true" selection-start-line="19" selection-start-column="24" selection-end-line="19" selection-end-column="24" /> <caret line="11" column="17" lean-forward="true" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -135,8 +147,6 @@ ...@@ -135,8 +147,6 @@
<option value="$PROJECT_DIR$/.env" /> <option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/public/index.html" /> <option value="$PROJECT_DIR$/public/index.html" />
<option value="$PROJECT_DIR$/package.json" /> <option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/.dockerignore" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/env.sh" /> <option value="$PROJECT_DIR$/env.sh" />
<option value="$PROJECT_DIR$/Dockerfile" /> <option value="$PROJECT_DIR$/Dockerfile" />
<option value="$PROJECT_DIR$/src/utils/webSocket.js" /> <option value="$PROJECT_DIR$/src/utils/webSocket.js" />
...@@ -144,6 +154,9 @@ ...@@ -144,6 +154,9 @@
<option value="$PROJECT_DIR$/src/actions/authActions.js" /> <option value="$PROJECT_DIR$/src/actions/authActions.js" />
<option value="$PROJECT_DIR$/nginx/nginx.conf" /> <option value="$PROJECT_DIR$/nginx/nginx.conf" />
<option value="$PROJECT_DIR$/k8s/cloudl-client-deployment.yml" /> <option value="$PROJECT_DIR$/k8s/cloudl-client-deployment.yml" />
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/.dockerignore" />
</list> </list>
</option> </option>
</component> </component>
...@@ -272,18 +285,18 @@ ...@@ -272,18 +285,18 @@
<workItem from="1567911514938" duration="3997000" /> <workItem from="1567911514938" duration="3997000" />
<workItem from="1568091114247" duration="25000" /> <workItem from="1568091114247" duration="25000" />
<workItem from="1568091711255" duration="548000" /> <workItem from="1568091711255" duration="548000" />
<workItem from="1568093890915" duration="4621000" /> <workItem from="1568093890915" duration="4915000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="77421000" /> <option name="totallyTimeSpent" value="77715000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1680" height="1050" extended-state="0" /> <frame x="0" y="0" width="1680" height="1050" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20735383" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20735383" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="npm" order="2" side_tool="true" /> <window_info id="npm" order="2" side_tool="true" />
<window_info id="Favorites" order="3" side_tool="true" /> <window_info id="Favorites" order="3" side_tool="true" />
...@@ -298,7 +311,7 @@ ...@@ -298,7 +311,7 @@
<window_info anchor="bottom" id="Docker" order="8" weight="0.32959184" /> <window_info anchor="bottom" id="Docker" order="8" weight="0.32959184" />
<window_info anchor="bottom" id="Version Control" order="9" /> <window_info anchor="bottom" id="Version Control" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50030136" side_tool="true" weight="0.4642857" /> <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50030136" side_tool="true" weight="0.4642857" />
<window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.4996986" visible="true" weight="0.4642857" /> <window_info anchor="bottom" id="Terminal" order="11" sideWeight="0.4996986" visible="true" weight="0.4642857" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
...@@ -555,31 +568,34 @@ ...@@ -555,31 +568,34 @@
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/env.sh" /> <entry file="file://$PROJECT_DIR$/env.sh" />
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/nginx/nginx.conf">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360"> <state relative-caret-position="255">
<caret line="24" column="8" selection-start-line="24" selection-start-column="8" selection-end-line="24" selection-end-column="8" /> <caret line="17" column="45" lean-forward="true" selection-start-line="17" selection-start-column="45" selection-end-line="17" selection-end-column="45" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.dockerignore"> <entry file="file://$PROJECT_DIR$/src/actions/authActions.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375"> <state relative-caret-position="148">
<caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" /> <caret line="13" column="31" lean-forward="true" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/utils/webSocket.js"> <entry file="file://$PROJECT_DIR$/k8s/cloudl-client-service.yml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15"> <state relative-caret-position="165">
<caret line="1" selection-start-line="1" selection-end-line="1" /> <caret line="11" column="20" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/nginx/nginx.conf"> <entry file="file://$PROJECT_DIR$/src/utils/webSocket.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="60">
<caret line="17" column="45" lean-forward="true" selection-start-line="17" selection-start-column="45" selection-end-line="17" selection-end-column="45" /> <caret line="4" column="22" lean-forward="true" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -590,27 +606,31 @@ ...@@ -590,27 +606,31 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/actions/authActions.js"> <entry file="file://$PROJECT_DIR$/.dockerignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="148"> <state relative-caret-position="405">
<caret line="13" column="31" lean-forward="true" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" /> <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/k8s/cloudl-client-service.yml"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="420">
<caret line="11" column="20" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" /> <caret line="28" selection-start-line="28" selection-end-line="28" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/k8s/cloudl-client-deployment.yml"> <entry file="file://$PROJECT_DIR$/k8s/cloudl-client-deployment.yml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="165">
<caret line="19" column="24" lean-forward="true" selection-start-line="19" selection-start-column="24" selection-end-line="19" selection-end-column="24" /> <caret line="11" column="17" lean-forward="true" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="487">
<caret line="39" column="55" selection-start-line="39" selection-start-column="55" selection-end-line="39" selection-end-column="55" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment