From 14708755b3363f835efd67ac18f1f9a94ecd8e96 Mon Sep 17 00:00:00 2001 From: Akhil Date: Mon, 31 Oct 2022 19:22:47 +0530 Subject: [PATCH 1/4] Add selfhost-22 tag --- templates/docker-compose/docker-compose.yml | 4 ++-- upgrade-guides/upgrade-to-22.0.10.8.md | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 upgrade-guides/upgrade-to-22.0.10.8.md diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml index d049c89..fcd0a16 100644 --- a/templates/docker-compose/docker-compose.yml +++ b/templates/docker-compose/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: mailserver: - image: mailserver2/mailserver:1.1.4 + image: mailserver2/mailserver:1.1.10 container_name: mailserver domainname: ${DOMAIN} # Mail server A/MX/FQDN & reverse PTR = mail.${DOMAIN}. hostname: mail @@ -126,7 +126,7 @@ services: - "${DOMAIN}:${NC_HOST_IP}" nextcloud: - image: registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:selfhost-21-0-9-12 + image: registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:selfhost-22 container_name: nextcloud restart: always networks: diff --git a/upgrade-guides/upgrade-to-22.0.10.8.md b/upgrade-guides/upgrade-to-22.0.10.8.md new file mode 100644 index 0000000..63530fe --- /dev/null +++ b/upgrade-guides/upgrade-to-22.0.10.8.md @@ -0,0 +1,17 @@ +# To upgrade from ecloud 20.x.x.x to 21.0.9.12 + +- As usual, upgrade your OS with latest patchs, optionally take backup/snapshot + + - NB: you may want to filter out incomming email (TCP 25 & 587) during this upgrade, to avoid losing any messages in case of a rollback + +- In your `docker-compose.yml` file update the following: + - Set the nextcloud image to `registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:selfhost-22` + - Set the mailserver image to `mailserver2/mailserver:1.1.10` +- Run `docker-compose pull` +- Run `docker-compose up -d` + +- Examine `docker-compose logs --tail=500 nextcloud` for the following messages: + - `nextcloud | Upgrading nextcloud from x.x.x.x ...` (x.x.x.x is your previous Nextcloud version) + - `nextcloud | Update successful` + +- Run `docker exec -T --user www-data nextcloud php occ db:add-missing-indices` -- GitLab From 59c5aae425ef590963016aaa184bbcfcc0c28142 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 11 Jan 2023 14:12:27 +0530 Subject: [PATCH 2/4] Update images --- templates/docker-compose/docker-compose.yml | 4 ++-- .../{upgrade-to-22.0.10.8.md => upgrade-to-22.0.10.11.md} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename upgrade-guides/{upgrade-to-22.0.10.8.md => upgrade-to-22.0.10.11.md} (84%) diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml index fcd0a16..384a664 100644 --- a/templates/docker-compose/docker-compose.yml +++ b/templates/docker-compose/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: mailserver: - image: mailserver2/mailserver:1.1.10 + image: mailserver2/mailserver:1.1.11 container_name: mailserver domainname: ${DOMAIN} # Mail server A/MX/FQDN & reverse PTR = mail.${DOMAIN}. hostname: mail @@ -126,7 +126,7 @@ services: - "${DOMAIN}:${NC_HOST_IP}" nextcloud: - image: registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:selfhost-22 + image: registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:22-2-10-11 container_name: nextcloud restart: always networks: diff --git a/upgrade-guides/upgrade-to-22.0.10.8.md b/upgrade-guides/upgrade-to-22.0.10.11.md similarity index 84% rename from upgrade-guides/upgrade-to-22.0.10.8.md rename to upgrade-guides/upgrade-to-22.0.10.11.md index 63530fe..f4ed263 100644 --- a/upgrade-guides/upgrade-to-22.0.10.8.md +++ b/upgrade-guides/upgrade-to-22.0.10.11.md @@ -1,4 +1,4 @@ -# To upgrade from ecloud 20.x.x.x to 21.0.9.12 +# To upgrade from ecloud 21.x.x.x to 22.0.10.11 - As usual, upgrade your OS with latest patchs, optionally take backup/snapshot @@ -14,4 +14,4 @@ - `nextcloud | Upgrading nextcloud from x.x.x.x ...` (x.x.x.x is your previous Nextcloud version) - `nextcloud | Update successful` -- Run `docker exec -T --user www-data nextcloud php occ db:add-missing-indices` +- Run `docker-compose exec -T --user www-data nextcloud php occ db:add-missing-indices` -- GitLab From 71aba4000a8d543eb50da027a9277c137c16e11b Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 11 Jan 2023 14:13:13 +0530 Subject: [PATCH 3/4] Correct version --- .../{upgrade-to-22.0.10.11.md => upgrade-to-22.2.10.11.md} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename upgrade-guides/{upgrade-to-22.0.10.11.md => upgrade-to-22.2.10.11.md} (94%) diff --git a/upgrade-guides/upgrade-to-22.0.10.11.md b/upgrade-guides/upgrade-to-22.2.10.11.md similarity index 94% rename from upgrade-guides/upgrade-to-22.0.10.11.md rename to upgrade-guides/upgrade-to-22.2.10.11.md index f4ed263..e6f9709 100644 --- a/upgrade-guides/upgrade-to-22.0.10.11.md +++ b/upgrade-guides/upgrade-to-22.2.10.11.md @@ -1,4 +1,4 @@ -# To upgrade from ecloud 21.x.x.x to 22.0.10.11 +# To upgrade from ecloud 21.x.x.x to 22.2.10.11 - As usual, upgrade your OS with latest patchs, optionally take backup/snapshot -- GitLab From 824796d1bff9e355849415010f9ceb3569be1831 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 11 Jan 2023 14:15:16 +0530 Subject: [PATCH 4/4] Correct instruction in README --- upgrade-guides/upgrade-to-22.2.10.11.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upgrade-guides/upgrade-to-22.2.10.11.md b/upgrade-guides/upgrade-to-22.2.10.11.md index e6f9709..2b7075b 100644 --- a/upgrade-guides/upgrade-to-22.2.10.11.md +++ b/upgrade-guides/upgrade-to-22.2.10.11.md @@ -5,7 +5,7 @@ - NB: you may want to filter out incomming email (TCP 25 & 587) during this upgrade, to avoid losing any messages in case of a rollback - In your `docker-compose.yml` file update the following: - - Set the nextcloud image to `registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:selfhost-22` + - Set the nextcloud image to `registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:22-2-10-11` - Set the mailserver image to `mailserver2/mailserver:1.1.10` - Run `docker-compose pull` - Run `docker-compose up -d` -- GitLab