Skip to content

Commit

Permalink
Resolved conflicts and updated files
Browse files Browse the repository at this point in the history
  • Loading branch information
MinhPhamLapTrinh committed Oct 28, 2024
1 parent c001849 commit 447ede6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions automateKrsHealth.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash

# Store the container ID in a variable and execute the 'krs health' command
containerID=$(docker ps -q --filter ancestor=kubetoolsca/krs-docker-extension:0.0.1 | head -n 1)
containerID=$(docker ps -q --filter ancestor=kubetoolsca/krs-docker-extension:0.0.3 | head -n 1)
if [ -n "$containerID" ]; then
while true; do
docker exec -it $containerID krs health
echo "ttyd is running, visit http://localhost:57681/ to interact with krs health."
done
else
echo "No running container found for kubetoolsca/krs-docker-extension:0.0.1"
echo "No running container found for kubetoolsca/krs-docker-extension:0.0.3"
fi
6 changes: 3 additions & 3 deletions client/src/helper/krs-helpers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export const startKrsContainer = async (ddClient: v1.DockerDesktopClient) => {
`${
contextConfigPath == '' ? '~/.minikube' : contextConfigPath
}:/root/.minikube`,
'kubetoolsca/krs-docker-extension:0.0.1', // Docker image to run
'kubetoolsca/krs-docker-extension:0.0.3', // Docker image to run
'sleep',
'infinity',
]);
Expand All @@ -111,7 +111,7 @@ export const startKrsContainer = async (ddClient: v1.DockerDesktopClient) => {
`${
contextConfigPath == '' ? '~/.aws' : contextConfigPath
}:/root/.aws`,
'kubetoolsca/krs-docker-extension:0.0.1', // Docker image to run
'kubetoolsca/krs-docker-extension:0.0.3', // Docker image to run
'sleep',
'infinity',
]);
Expand All @@ -123,7 +123,7 @@ export const startKrsContainer = async (ddClient: v1.DockerDesktopClient) => {
'host', // Add the --network host option
'-v', // Volume flag
`${kubeConfigPath}:/root/.kube/config`, // Mount the local ~/.kube/config to the container's /root/.kube/config
'kubetoolsca/krs-docker-extension:0.0.1', // Docker image to run
'kubetoolsca/krs-docker-extension:0.0.3', // Docker image to run
'sleep',
'infinity',
]);
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
krs-extension:
image: kubetoolsca/krs-docker-extension:0.0.2
image: kubetoolsca/krs-docker-extension:0.0.3
hostname: krs-extension
ports:
- 4999:3986
Expand Down

0 comments on commit 447ede6

Please sign in to comment.