deploy & upgrade test results

Author: LeKovr

.gitignore

@@ -1,3 +1,3 @@
-*.env
+*.env*
 data
 redis

Makefile

@@ -22,6 +22,7 @@ DCAPE_TAG          ?= dcape
 DCAPE_NET          ?= $(DCAPE_TAG)
 PG_CONTAINER       ?= $(DCAPE_TAG)_db_1
 APP_ROOT           ?= $(PWD)
+REDIS_PASS         ?= $(shell < /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c8; echo)
 DC_VER             ?= latest
 
 define CONFIG_DEF
@@ -52,6 +53,7 @@ PGUSER=$(PGUSER)
 # Database user password
 PGPASSWORD=$(PGPASSWORD)
 # Database dump for import on create
+# Used as ${PG_DUMP_SOURCE}.{tar|tgz}
 PG_DUMP_SOURCE=$(PG_DUMP_SOURCE)
 
 # Docker details
@@ -69,6 +71,9 @@ DCAPE_NET=$(DCAPE_NET)
 # dcape postgresql container name
 PG_CONTAINER=$(PG_CONTAINER)
 
+# Redis access password
+REDIS_PASS=$(REDIS_PASS)
+
 # Nextcloud image name
 IMAGE=$(IMAGE)
 # Redis image name
@@ -137,14 +142,17 @@ docker-wait:
 
 # Database import script
 # DCAPE_DB_DUMP_DEST must be set in pg container
-
+# zcat pipe may cause "terminated by signal 13" error, so .tar is also supported
 define IMPORT_SCRIPT
 [ "$$DCAPE_DB_DUMP_DEST" ] || { echo "DCAPE_DB_DUMP_DEST not set. Exiting" ; exit 1 ; } ; \
 DB_NAME="$$1" ; DB_USER="$$2" ; DB_PASS="$$3" ; DB_SOURCE="$$4" ; \
-dbsrc=$$DCAPE_DB_DUMP_DEST/$$DB_SOURCE.tgz ; \
-if [ -f $$dbsrc ] ; then \
-  echo "Dump file $$dbsrc found, restoring database..." ; \
-  zcat $$dbsrc | PGPASSWORD=$$DB_PASS pg_restore -h localhost -U $$DB_USER -O -Ft -d $$DB_NAME || exit 1 ; \
+dbsrc=$$DCAPE_DB_DUMP_DEST/$$DB_SOURCE ; \
+if [ -f $${dbsrc}.tgz ] ; then \
+  echo "Dump file $${dbsrc}.tgz found, restoring database..." ; \
+  zcat $${dbsrc}.tgz | PGPASSWORD=$$DB_PASS pg_restore -h localhost -U $$DB_USER -O -Ft -d $$DB_NAME || exit 1 ; \
+elif [ -f $${dbsrc}.tar ] ; then \
+  echo "Dump file $${dbsrc}.tar found, restoring database..." ; \
+  PGPASSWORD=$$DB_PASS pg_restore -h localhost -U $$DB_USER -O -d $$DB_NAME $${dbsrc}.tar || exit 1 ; \
 else \
   echo "Dump file $$dbsrc not found" ; \
   exit 2 ; \
@@ -161,8 +169,8 @@ db-create: docker-wait
 	docker exec -i $$PG_CONTAINER psql -U postgres -c "CREATE DATABASE \"$$PGDATABASE\" OWNER \"$$PGUSER\";" 2>&1 > .psql.log | grep  "already exists" > /dev/null || db_exists=1 ; \
 	cat .psql.log ; rm .psql.log ; \
 	if [ "$$db_exists" = "1" ] ; then \
-	  echo "*** db data load" ; \
 	  if [ "$$PG_DUMP_SOURCE" ] ; then \
+	    echo "*** db data load" ; \
 	    echo "$$IMPORT_SCRIPT" | docker exec -i $$PG_CONTAINER bash -s - $$PGDATABASE $$PGUSER $$PGPASSWORD $$PG_DUMP_SOURCE \
 	    && docker exec -i $$PG_CONTAINER psql -U postgres -c "COMMENT ON DATABASE \"$$PGDATABASE\" IS 'SOURCE $$PG_DUMP_SOURCE';" \
 	    || true ; \

README.md

@@ -27,6 +27,13 @@ nextcloud.com application package for dcape
 
 ## Usage
 
+
+* Gitea: Fork or mirror this repo in your Git service
+* Drone: Activate repo
+* Gitea: Run "Test delivery", config sample will be saved to enfist
+* Enfist: Edit config and remove .sample from name
+* Run "Test delivery" again (app will be installed and started on webhook host)
+
 ### Redis
 ```
 sysctl vm.overcommit_memory=1
@@ -39,17 +46,36 @@ config/config.php:
 'overwriteprotocol' => 'https',
 ```
 
-* Fork this repo in your Git service
-* Setup deploy hook
-* Run "Test delivery" (config sample will be created in dcape)
-* Edit and save config (enable deploy etc)
-* Run "Test delivery" again (app will be installed and started on webhook host)
-* Fork [dopos/dcape-dns-config](https://github/com/dopos/dcape-dns-config) and cook your zones
+## Upgrade
+
+#### v17 -> v18
+
+* IMAGE_VER=18.0.11-apache
+* В каталоге data развернуть из старой версии config,data
+* поднять БД из дампа
+* chown -R 32:101 data
+* `make up` - остальное в data появится
+* `make dc CMD="run --rm -u www-data cloud-app php occ upgrade"`
+* Ошибка "Column name "oc_flow_operations"."entity" is NotNull, but has empty string or null as default.".
+ Решение: `ALTER TABLE oc_flow_operations ADD COLUMN entity VARCHAR NOT NULL;` и повторить обновление
+
+#### v18 -> v19
+
+* IMAGE_VER=19.0.5-fpm-alpine
+* chown -R 82:101 data
+* `make up`
+
+#### v19 -> v20
 
-See also: [Deploy setup](https://github.com/dopos/dcape/blob/master/DEPLOY.md) (in Russian)
+* IMAGE_VER=20.0.3-fpm-alpine
+* `make up`
+* chown -R 82:101 data
+* `make dc CMD="run --rm -u www-data cloud-app php occ maintenance:mode --off"`
+* открываем /settings/admin/overview - там напишут, какие команды еще запустить
+* в одном месте все может отвалиться из-за подтверждения. Решение: `make dc CMD="run --rm  -u www-data cloud-app php occ db:convert-filecache-bigint --no-interaction"`
 
 ## License
 
 The MIT License (MIT), see [LICENSE](LICENSE).
 
-Copyright (c) 2019 Aleksei Kovrizhkin <lekovr+dopos@gmail.com>
+Copyright (c) 2019-2020 Aleksei Kovrizhkin <lekovr+dopos@gmail.com>

docker-compose.yml

@@ -44,10 +44,12 @@ services:
       - NEXTCLOUD_ADMIN_PASSWORD=${USER_PASS}
       - NEXTCLOUD_TRUSTED_DOMAINS=${APP_SITE}
       - REDIS_HOST=cloud-cache
+      - REDIS_HOST_PASSWORD=${REDIS_PASS}
 
   cloud-cache:
     image: ${REDIS_IMAGE}:${REDIS_IMAGE_VER}
     restart: always
+    command: redis-server --requirepass ${REDIS_PASS}
 #    sysctls:
 #      net.core.somaxconn: 511
     networks: