fix for integration test and compose file using the correct versions.

This commit is contained in:
Erik Brakkee 2024-08-28 19:26:52 +02:00
parent bebb2f5ff7
commit 69b58976ae
4 changed files with 12 additions and 6 deletions

View File

@ -15,7 +15,7 @@ services:
context: .
dockerfile: Dockerfile.prod
args:
BASE_IMAGE: $REGISTRY/converge-builder:1.0
BASE_IMAGE: $REGISTRY/converge-builder:1.0.0
ports:
- 8000:8000
@ -26,7 +26,7 @@ services:
context: .
dockerfile: Dockerfile.test
args:
BASE_IMAGE: $REGISTRY/converge-builder:1.0
BASE_IMAGE: $REGISTRY/converge-builder:1.0.0
profiles:
- build_only

View File

@ -44,8 +44,9 @@ const (
)
var (
convergeImage = fmt.Sprintf("%s/converge:1.0", getRegistry())
agentImage = fmt.Sprintf("%s/converge-test:1.0", getRegistry())
version = "1.0.0"
convergeImage = fmt.Sprintf("%s/converge:%s", getRegistry(), version)
agentImage = fmt.Sprintf("%s/converge-test:%s", getRegistry(), version)
clientImage = agentImage
)

View File

@ -2,5 +2,5 @@
```
halm install converge --set registry=my.registry.com
helm install converge --set registry=my.registry.com
```

View File

@ -170,7 +170,10 @@ templ About() {
<ul>
<li>Use the websocket protocol both for agents and for clients, providing a fixed port and
a supported protocol for kubernetes deploymment. Websockets are also supported by
kubernetes ingress controllers so this makes it easy to deploy on kubernetes. </li>
kubernetes ingress controllers so this makes it easy to deploy on kubernetes.
To make this work with SSH which does not natively support websockets, a proxycommand
<code>wsproxy</code> is provided that allows SSH to connect using websockets.
</li>
<li>Providing online documentation where the instructions take into account the
hostname and protocol where converge is running allowing users to cut and paste
instructions that can be used without modification. In the usage page the users
@ -189,6 +192,8 @@ templ About() {
simple inactivity timeout mechanism. </li>
<li>Possibility for the user to define the remote shell to use. </li>
<li>Support for unix like bash shells and command prompt and powershell. </li>
<li>Observability w.r.t. non-functionals of converge and of agent and client sessions through
prometheus monitoring. For session monitoring, separate grafana dashboard is provided. </li>
</ul>
<p>
</p>