diff options
| author | adrien <adrien@luxeylab.net> | 2020-11-29 23:19:44 +0100 |
|---|---|---|
| committer | adrien <adrien@luxeylab.net> | 2020-11-29 23:19:44 +0100 |
| commit | de3e21101dfcb6e7c4f293a23e0ced33ed2fa5a9 (patch) | |
| tree | 1ace583053e79f6b77870e320efe0fdb28fc9b68 | |
| parent | d241948034cc2f0dc9691520495f98bf84dd4338 (diff) | |
| parent | da1d381068bc8e90e955d2db8ab9078b4f0b333d (diff) | |
| download | infrastructure-de3e21101dfcb6e7c4f293a23e0ced33ed2fa5a9.tar.gz infrastructure-de3e21101dfcb6e7c4f293a23e0ced33ed2fa5a9.zip | |
Merge pull request 'Pushed synapse version to 1.23.0 and riotweb to 1.7.14, incl. nomad deployment' (#25) from adrien/infrastructure:master into master
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/infrastructure/pulls/25
| -rw-r--r-- | app/build/docker-compose.yml | 8 | ||||
| -rw-r--r-- | app/deployment/im.hcl | 4 | ||||
| -rw-r--r-- | op_guide/update_matrix.md | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml index fadabb8..0b142c1 100644 --- a/app/build/docker-compose.yml +++ b/app/build/docker-compose.yml @@ -14,16 +14,16 @@ services: context: ./riotweb args: # https://github.com/vector-im/riot-web/releases - VERSION: 1.7.9 - image: superboum/amd64_riotweb:v17 + VERSION: 1.7.14 + image: particallydone/amd64_riotweb:v18 synapse: build: context: ./matrix-synapse args: # https://github.com/matrix-org/synapse/releases - VERSION: 1.22.1 - image: superboum/amd64_synapse:v37 + VERSION: 1.23.0 + image: particallydone/amd64_synapse:v38 # Email sogo: diff --git a/app/deployment/im.hcl b/app/deployment/im.hcl index 79b44c6..0823eac 100644 --- a/app/deployment/im.hcl +++ b/app/deployment/im.hcl @@ -8,7 +8,7 @@ job "im" { driver = "docker" config { - image = "superboum/amd64_synapse:v37" + image = "particallydone/amd64_synapse:v38" network_mode = "host" readonly_rootfs = true command = "python" @@ -233,7 +233,7 @@ job "im" { task "server" { driver = "docker" config { - image = "superboum/amd64_riotweb:v17" + image = "particallydone/amd64_riotweb:v18" port_map { web_port = 8043 } diff --git a/op_guide/update_matrix.md b/op_guide/update_matrix.md index 9387a7f..7df588f 100644 --- a/op_guide/update_matrix.md +++ b/op_guide/update_matrix.md @@ -70,7 +70,7 @@ nomad plan im.hcl ``` Check that the proposed diff corresponds to what you have in mind. -If it seems OK, just copy paste the proposed `nomad run ...` command proposed as part of the output of the `nomad plan` command. +If it seems OK, just copy paste the proposed `nomad job run ... im.hcl` command proposed as part of the output of the `nomad plan` command. From now, it will take around ~2 minutes to deploy the new images. You can follow the deployment from the Nomad UI. |