fix for integration test and compose file using the correct versions.
This commit is contained in:
parent
bebb2f5ff7
commit
69b58976ae
@ -15,7 +15,7 @@ services:
|
|||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile.prod
|
dockerfile: Dockerfile.prod
|
||||||
args:
|
args:
|
||||||
BASE_IMAGE: $REGISTRY/converge-builder:1.0
|
BASE_IMAGE: $REGISTRY/converge-builder:1.0.0
|
||||||
ports:
|
ports:
|
||||||
- 8000:8000
|
- 8000:8000
|
||||||
|
|
||||||
@ -26,7 +26,7 @@ services:
|
|||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile.test
|
dockerfile: Dockerfile.test
|
||||||
args:
|
args:
|
||||||
BASE_IMAGE: $REGISTRY/converge-builder:1.0
|
BASE_IMAGE: $REGISTRY/converge-builder:1.0.0
|
||||||
profiles:
|
profiles:
|
||||||
- build_only
|
- build_only
|
||||||
|
|
||||||
|
@ -44,8 +44,9 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
convergeImage = fmt.Sprintf("%s/converge:1.0", getRegistry())
|
version = "1.0.0"
|
||||||
agentImage = fmt.Sprintf("%s/converge-test:1.0", getRegistry())
|
convergeImage = fmt.Sprintf("%s/converge:%s", getRegistry(), version)
|
||||||
|
agentImage = fmt.Sprintf("%s/converge-test:%s", getRegistry(), version)
|
||||||
clientImage = agentImage
|
clientImage = agentImage
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -2,5 +2,5 @@
|
|||||||
|
|
||||||
|
|
||||||
```
|
```
|
||||||
halm install converge --set registry=my.registry.com
|
helm install converge --set registry=my.registry.com
|
||||||
```
|
```
|
@ -170,7 +170,10 @@ templ About() {
|
|||||||
<ul>
|
<ul>
|
||||||
<li>Use the websocket protocol both for agents and for clients, providing a fixed port and
|
<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
|
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
|
<li>Providing online documentation where the instructions take into account the
|
||||||
hostname and protocol where converge is running allowing users to cut and paste
|
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
|
instructions that can be used without modification. In the usage page the users
|
||||||
@ -189,6 +192,8 @@ templ About() {
|
|||||||
simple inactivity timeout mechanism. </li>
|
simple inactivity timeout mechanism. </li>
|
||||||
<li>Possibility for the user to define the remote shell to use. </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>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>
|
</ul>
|
||||||
<p>
|
<p>
|
||||||
</p>
|
</p>
|
||||||
|
Loading…
Reference in New Issue
Block a user