Commit ee83e443 authored by kavinduchamiran's avatar kavinduchamiran

fix3

parent 4da05f43
...@@ -18,8 +18,6 @@ docker_build: ...@@ -18,8 +18,6 @@ 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
...@@ -39,6 +37,7 @@ kube_deploy: ...@@ -39,6 +37,7 @@ kube_deploy:
- kubectl config set-credentials admin --username="${KUBE_USERNAME}" --password="${KUBE_PASSWORD}" - kubectl config set-credentials admin --username="${KUBE_USERNAME}" --password="${KUBE_PASSWORD}"
- kubectl config set-context default --cluster=cloudl --user=${KUBE_USERNAME} - kubectl config set-context default --cluster=cloudl --user=${KUBE_USERNAME}
- kubectl config use-context default - kubectl config use-context default
- ls . - cd k8s
- kubectl apply -f k8s/cloudl-client-deployment.yml - kubectl apply -f cloudl-client-deployment.yml
- kubectl apply -f cloudl-client-service.yml
# - kubectl set image deployment/${CI_COMMIT_REF_NAME}-deployment ${CI_COMMIT_REF_NAME}=kavinduchamiran/${CI_COMMIT_REF_NAME}:latest # - kubectl set image deployment/${CI_COMMIT_REF_NAME}-deployment ${CI_COMMIT_REF_NAME}=kavinduchamiran/${CI_COMMIT_REF_NAME}:latest
\ No newline at end of file
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
<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$/.gitlab-ci.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.gitlab-ci.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
...@@ -58,8 +57,8 @@ ...@@ -58,8 +57,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml"> <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="487"> <state relative-caret-position="274">
<caret line="39" column="55" selection-start-line="39" selection-start-column="55" selection-end-line="39" selection-end-column="55" /> <caret line="19" column="9" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -154,9 +153,9 @@ ...@@ -154,9 +153,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$/.gitignore" />
<option value="$PROJECT_DIR$/.dockerignore" /> <option value="$PROJECT_DIR$/.dockerignore" />
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
</list> </list>
</option> </option>
</component> </component>
...@@ -285,18 +284,18 @@ ...@@ -285,18 +284,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="4915000" /> <workItem from="1568093890915" duration="5280000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="77715000" /> <option name="totallyTimeSpent" value="78080000" />
</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 active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20735383" /> <window_info 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" />
...@@ -311,7 +310,7 @@ ...@@ -311,7 +310,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 anchor="bottom" id="Terminal" order="11" sideWeight="0.4996986" visible="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="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" />
...@@ -629,8 +628,8 @@ ...@@ -629,8 +628,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml"> <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="487"> <state relative-caret-position="274">
<caret line="39" column="55" selection-start-line="39" selection-start-column="55" selection-end-line="39" selection-end-column="55" /> <caret line="19" column="9" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -11,7 +11,7 @@ spec: ...@@ -11,7 +11,7 @@ spec:
spec: spec:
containers: containers:
- name: cloudl-client - name: cloudl-client
image: kavinduchamiran/cloudl-client:v1 image: kavinduchamiran/cloudl-client:latest
ports: ports:
- containerPort: 80 - containerPort: 80
name: http-port name: http-port
......
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