Aktualizacja v2.2.0 -> v2.3.0

Moderator: fracz

User avatar
fracz
Posts: 1487
Joined: Fri Oct 28, 2016 10:56 pm
Location: Rybna

Fri Feb 15, 2019 8:02 pm

Docker 18+ jest ok.

Jeśli chodzi o qnapy - trzeba zmienić mapowanie katalogu z supla-server-socket ten i ten niżej https://github.com/SUPLA/supla-docker/b ... se.yml#L14 na lokalny katalog tak jak tutaj bylo: https://github.com/SUPLA/supla-docker/b ... se.yml#L27

I powinno działać. Tyle że ja mam aktualnie telefon i nie mam jak tego dłubać w ten sposób, więc może lesny8 ma ochotę na pułk request :-)
User avatar
Woden
Posts: 32
Joined: Sat Mar 10, 2018 9:17 am

Fri Feb 15, 2019 8:10 pm

Ok, dziękuję za informację. Będę walczył z tym tematem. Szkoda tylko, że przywracanie obrazu 32GB karty SD trwa wieczność.
User avatar
lesny8
Posts: 642
Joined: Mon Dec 11, 2017 9:43 pm

Fri Feb 15, 2019 9:34 pm

fracz wrote:
Fri Feb 15, 2019 8:02 pm
może lesny8 ma ochotę na pułk request :-)
Ochota jest ale ale to w gałęzi master ma być ta zmiana?
Na qnapie trzeba wybrać gałąź qnap, a tam są te templaty. Jeszcze nie wiem jak to ruszyć. W temacie dockera to ja dopiero raczkuję i wszystkiego nie wiem ;)
Zrobiłem sobie fork-a, sprubuję przećwiczyć w temacie, jak dojdę co i jak to podrzucę PR.
User avatar
fracz
Posts: 1487
Joined: Fri Oct 28, 2016 10:56 pm
Location: Rybna

Fri Feb 15, 2019 9:35 pm

QNapowcy z błędem "SUPLA Server is down", spróbujcie czy to poprawi sytuację:

Code: Select all

cd supla-docker
git fetch
git checkout qnap-2.3
./supla.sh restart
lesny8 wrote:
Fri Feb 15, 2019 9:34 pm
Zrobiłem sobie fork-a, sprubuję przećwiczyć w temacie, jak dojdę co i jak to podrzucę PR.
Dzięki! I generalnie za mocne wsparcie tutaj na forum :-)

Podrzuciłem wyżej zmianę o której pisałem, potrzebujemy weryfikacji czy to naprawi problem. Jeśli tak, znaczy że nadal jest tam dość stara wersja dockera.

Na gałęzi qnap jest konfiguracja tego cudownego wizarda, by dało się suplę zainstalować z GUI. Natomiast wszystko się sprowadza do tego by przygotować odpowiedniego composa... który w tym GUI jest w jeszcze bardziej prehistorycznej wersji.
User avatar
Woden
Posts: 32
Joined: Sat Mar 10, 2018 9:17 am

Fri Feb 15, 2019 9:47 pm

Code: Select all

pi@raspberrypi:~ $ cd supla-docker
pi@raspberrypi:~/supla-docker $ git pull
remote: Enumerating objects: 66, done.
remote: Counting objects: 100% (66/66), done.
remote: Compressing objects: 100% (36/36), done.
remote: Total 66 (delta 25), reused 61 (delta 20), pack-reused 0
Unpacking objects: 100% (66/66), done.
From https://github.com/SUPLA/supla-docker
   5a0a6c7..1873994  master           -> origin/master
 * [new branch]      espressif        -> origin/espressif
 * [new branch]      qnap-2.3         -> origin/qnap-2.3
 * [new branch]      server-devel-env -> origin/server-devel-env
   eb33fb1..d51e754  src              -> origin/src
 * [new tag]         v2.3.0           -> v2.3.0
Updating 5a0a6c7..1873994
[b]error: Your local changes to the following files would be overwritten by merge:
        docker-compose.yml
Please commit your changes or stash them before you merge.
Aborting[/b]
Podczas aktualizacji wyskakuje mi error jak powyżej. Prośba o informację jak dla zielonego człowieka co z tym zrobić.
User avatar
Woden
Posts: 32
Joined: Sat Mar 10, 2018 9:17 am

Fri Feb 15, 2019 9:59 pm

Logi

Code: Select all

pi@raspberrypi:~/supla-docker $ docker logs --since=20m supla-server
2019-02-15 21:54:58,062 CRIT Supervisor running as root (no user in config file)
2019-02-15 21:54:58,076 INFO supervisord started with pid 1
2019-02-15 21:54:59,080 INFO spawned: 'supla-scheduler' with pid 11
2019-02-15 21:54:59,085 INFO spawned: 'supla-server' with pid 12
INFO[1550267699.178338] Scheduler version 2.3.1
INFO[1550267699.178591] Started at Fri Feb 15 21:54:59 2019
INFO[1550267699.178679] Server version 2.3.1 [Protocol v10]
INFO[1550267699.178842] Started at Fri Feb 15 21:54:59 2019
ERR[1550267699.253512] Incorrect database version!
ERR[1550267699.253509] Incorrect database version!
2019-02-15 21:54:59,259 INFO exited: supla-scheduler (exit status 1; not expected)
2019-02-15 21:54:59,260 INFO exited: supla-server (exit status 1; not expected)
2019-02-15 21:55:00,265 INFO spawned: 'supla-scheduler' with pid 15
2019-02-15 21:55:00,270 INFO spawned: 'supla-server' with pid 16
INFO[1550267700.292973] Scheduler version 2.3.1
INFO[1550267700.293201] Started at Fri Feb 15 21:55:00 2019
INFO[1550267700.302933] Server version 2.3.1 [Protocol v10]
INFO[1550267700.303298] Started at Fri Feb 15 21:55:00 2019
ERR[1550267700.308539] Incorrect database version!
2019-02-15 21:55:00,312 INFO exited: supla-scheduler (exit status 1; not expected)
ERR[1550267700.329468] Incorrect database version!
2019-02-15 21:55:00,335 INFO exited: supla-server (exit status 1; not expected)
2019-02-15 21:55:02,353 INFO spawned: 'supla-scheduler' with pid 19
2019-02-15 21:55:02,361 INFO spawned: 'supla-server' with pid 20
INFO[1550267702.470855] Scheduler version 2.3.1
INFO[1550267702.472953] Started at Fri Feb 15 21:55:02 2019
ERR[1550267702.516901] Incorrect database version!
2019-02-15 21:55:02,526 INFO exited: supla-scheduler (exit status 1; not expected)
INFO[1550267702.533972] Server version 2.3.1 [Protocol v10]
INFO[1550267702.544056] Started at Fri Feb 15 21:55:02 2019
ERR[1550267702.566715] Incorrect database version!
2019-02-15 21:55:02,575 INFO exited: supla-server (exit status 1; not expected)
2019-02-15 21:55:05,583 INFO spawned: 'supla-scheduler' with pid 23
2019-02-15 21:55:05,588 INFO spawned: 'supla-server' with pid 24
INFO[1550267705.613789] Scheduler version 2.3.1
INFO[1550267705.613993] Started at Fri Feb 15 21:55:05 2019
INFO[1550267705.616030] Server version 2.3.1 [Protocol v10]
INFO[1550267705.616267] Started at Fri Feb 15 21:55:05 2019
ERR[1550267705.625395] Incorrect database version!
ERR[1550267705.625398] Incorrect database version!
2019-02-15 21:55:05,628 INFO exited: supla-scheduler (exit status 1; not expected)
2019-02-15 21:55:05,629 INFO exited: supla-server (exit status 1; not expected)
2019-02-15 21:55:06,631 INFO gave up: supla-scheduler entered FATAL state, too many start retries too quickly
2019-02-15 21:55:06,632 INFO gave up: supla-server entered FATAL state, too many start retries too quickly
User avatar
lesny8
Posts: 642
Joined: Mon Dec 11, 2017 9:43 pm

Fri Feb 15, 2019 10:16 pm

Woden wrote:
Fri Feb 15, 2019 9:47 pm

Code: Select all

pi@raspberrypi:~ $ cd supla-docker
pi@raspberrypi:~/supla-docker $ git pull
remote: Enumerating objects: 66, done.
remote: Counting objects: 100% (66/66), done.
remote: Compressing objects: 100% (36/36), done.
remote: Total 66 (delta 25), reused 61 (delta 20), pack-reused 0
Unpacking objects: 100% (66/66), done.
From https://github.com/SUPLA/supla-docker
   5a0a6c7..1873994  master           -> origin/master
 * [new branch]      espressif        -> origin/espressif
 * [new branch]      qnap-2.3         -> origin/qnap-2.3
 * [new branch]      server-devel-env -> origin/server-devel-env
   eb33fb1..d51e754  src              -> origin/src
 * [new tag]         v2.3.0           -> v2.3.0
Updating 5a0a6c7..1873994
[b]error: Your local changes to the following files would be overwritten by merge:
        docker-compose.yml
Please commit your changes or stash them before you merge.
Aborting[/b]
Podczas aktualizacji wyskakuje mi error jak powyżej. Prośba o informację jak dla zielonego człowieka co z tym zrobić.
Zmieniałeś jakieś pliki lokalnie?
Pokaż co daje

Code: Select all

git stash list
git stash show
Woden wrote:
Fri Feb 15, 2019 9:59 pm
Logi

Code: Select all

pi@raspberrypi:~/supla-docker $ docker logs --since=20m supla-server
2019-02-15 21:54:58,062 CRIT Supervisor running as root (no user in config file)
2019-02-15 21:54:58,076 INFO supervisord started with pid 1
2019-02-15 21:54:59,080 INFO spawned: 'supla-scheduler' with pid 11
2019-02-15 21:54:59,085 INFO spawned: 'supla-server' with pid 12
INFO[1550267699.178338] Scheduler version 2.3.1
INFO[1550267699.178591] Started at Fri Feb 15 21:54:59 2019
INFO[1550267699.178679] Server version 2.3.1 [Protocol v10]
INFO[1550267699.178842] Started at Fri Feb 15 21:54:59 2019
ERR[1550267699.253512] Incorrect database version!
ERR[1550267699.253509] Incorrect database version!
2019-02-15 21:54:59,259 INFO exited: supla-scheduler (exit status 1; not expected)
2019-02-15 21:54:59,260 INFO exited: supla-server (exit status 1; not expected)
2019-02-15 21:55:00,265 INFO spawned: 'supla-scheduler' with pid 15
2019-02-15 21:55:00,270 INFO spawned: 'supla-server' with pid 16
INFO[1550267700.292973] Scheduler version 2.3.1
INFO[1550267700.293201] Started at Fri Feb 15 21:55:00 2019
INFO[1550267700.302933] Server version 2.3.1 [Protocol v10]
INFO[1550267700.303298] Started at Fri Feb 15 21:55:00 2019
ERR[1550267700.308539] Incorrect database version!
2019-02-15 21:55:00,312 INFO exited: supla-scheduler (exit status 1; not expected)
ERR[1550267700.329468] Incorrect database version!
2019-02-15 21:55:00,335 INFO exited: supla-server (exit status 1; not expected)
2019-02-15 21:55:02,353 INFO spawned: 'supla-scheduler' with pid 19
2019-02-15 21:55:02,361 INFO spawned: 'supla-server' with pid 20
INFO[1550267702.470855] Scheduler version 2.3.1
INFO[1550267702.472953] Started at Fri Feb 15 21:55:02 2019
ERR[1550267702.516901] Incorrect database version!
2019-02-15 21:55:02,526 INFO exited: supla-scheduler (exit status 1; not expected)
INFO[1550267702.533972] Server version 2.3.1 [Protocol v10]
INFO[1550267702.544056] Started at Fri Feb 15 21:55:02 2019
ERR[1550267702.566715] Incorrect database version!
2019-02-15 21:55:02,575 INFO exited: supla-server (exit status 1; not expected)
2019-02-15 21:55:05,583 INFO spawned: 'supla-scheduler' with pid 23
2019-02-15 21:55:05,588 INFO spawned: 'supla-server' with pid 24
INFO[1550267705.613789] Scheduler version 2.3.1
INFO[1550267705.613993] Started at Fri Feb 15 21:55:05 2019
INFO[1550267705.616030] Server version 2.3.1 [Protocol v10]
INFO[1550267705.616267] Started at Fri Feb 15 21:55:05 2019
ERR[1550267705.625395] Incorrect database version!
ERR[1550267705.625398] Incorrect database version!
2019-02-15 21:55:05,628 INFO exited: supla-scheduler (exit status 1; not expected)
2019-02-15 21:55:05,629 INFO exited: supla-server (exit status 1; not expected)
2019-02-15 21:55:06,631 INFO gave up: supla-scheduler entered FATAL state, too many start retries too quickly
2019-02-15 21:55:06,632 INFO gave up: supla-server entered FATAL state, too many start retries too quickly
Wygląda jakby baza danych nie przeszła migracji.
User avatar
Woden
Posts: 32
Joined: Sat Mar 10, 2018 9:17 am

Fri Feb 15, 2019 10:19 pm

Nic nie zmieniałem. Poniżej dane, o które prosiłeś.

Code: Select all

pi@raspberrypi:~/supla-docker $ git stash list
pi@raspberrypi:~/supla-docker $ git stash show
No stash found.
User avatar
lesny8
Posts: 642
Joined: Mon Dec 11, 2017 9:43 pm

Fri Feb 15, 2019 10:31 pm

Spróbuj może

Code: Select all

git checkout -f master
git pull
./supla.sh upgrade
User avatar
Woden
Posts: 32
Joined: Sat Mar 10, 2018 9:17 am

Fri Feb 15, 2019 10:41 pm

Na chwilę obecną wygląda na to, że się udało. Wielkie dzięki. Twoja pomoc (już po raz 2) jest nieoceniona :-)

Code: Select all

pi@raspberrypi:~/supla-docker $ git checkout -f master
Already on 'master'
Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
pi@raspberrypi:~/supla-docker $ git pull
Updating 5a0a6c7..1873994
Fast-forward
 README.md          | 2 +-
 docker-compose.yml | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
pi@raspberrypi:~/supla-docker $ ./supla.sh upgrade
Making database backup
Database backup saved to ./var/backups/supla02152019223834.sql.gz
Stopping SUPLA containers
Stopping supla-server ... done
Stopping supla-cloud  ... done
Stopping supla-db     ... done
SUPLA containers has been stopped.
Pulling supla-db     ... done
Pulling supla-cloud  ... done
Pulling supla-server ... done
Starting SUPLA containers
Creating volume "supla_supla-server-socket" with default driver
Recreating supla-db ... done
Recreating supla-cloud ... done
Recreating supla-server ... done
SUPLA containers has been started.
pi@raspberrypi:~/supla-docker $ docker logs --since=20m supla-server
2019-02-15 22:38:59,253 CRIT Supervisor running as root (no user in config file)
2019-02-15 22:38:59,260 INFO supervisord started with pid 1
2019-02-15 22:39:00,266 INFO spawned: 'supla-scheduler' with pid 11
2019-02-15 22:39:00,271 INFO spawned: 'supla-server' with pid 12
INFO[1550270340.294887] Scheduler version 2.3.1
INFO[1550270340.295160] Started at Fri Feb 15 22:39:00 2019
INFO[1550270340.301890] Server version 2.3.1 [Protocol v10]
INFO[1550270340.302293] Started at Fri Feb 15 22:39:00 2019
INFO[1550270340.325142] SSL version: OpenSSL 1.0.1t  3 May 2016
2019-02-15 22:39:01,327 INFO success: supla-scheduler entered RUNNING state, process has stayed up for > than 1 seconds (startsecs)
2019-02-15 22:39:01,347 INFO success: supla-server entered RUNNING state, process has stayed up for > than 1 seconds (startsecs)
Post Reply