Re: SUPLA Scripts
: pn maja 13, 2019 5:56 pm
Pobierz zmiany
I zrób reset
Kod: Zaznacz cały
git fetch
Kod: Zaznacz cały
git reset --hard origin/master
Kod: Zaznacz cały
git fetch
Kod: Zaznacz cały
git reset --hard origin/master
Coś ruszyło ale daje jakiś błądlesny8 pisze: ↑pn maja 13, 2019 5:56 pm Pobierz zmianyI zrób resetKod: Zaznacz cały
git fetch
Kod: Zaznacz cały
git reset --hard origin/master
Kod: Zaznacz cały
Connecting to 192.168.1.81 port 22, please wait...
login as:
pi@192.168.1.81's password:
Linux raspberrypi 4.14.79-v7+ #1159 SMP Sun Nov 4 17:50:20 GMT 2018 armv7l
The programs included with the Debian GNU/Linux system are free software;
the exact distribution terms for each program are described in the
individual files in /usr/share/doc/*/copyright.
Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent
permitted by applicable law.
Last login: Mon May 13 19:22:28 2019 from 192.168.1.65
pi@raspberrypi:~ $ git fetch
fatal: Not a git repository (or any of the parent directories): .git
pi@raspberrypi:~ $ cd supla-scripts
pi@raspberrypi:~/supla-scripts $ git fetch
pi@raspberrypi:~/supla-scripts $ git reset --hard origin/master
error: unable to unlink old 'var/config/config.sample.json': Brak dostępu
fatal: Could not reset index file to revision 'origin/master'.
pi@raspberrypi:~/supla-scripts $ sudo git reset --hard origin/master
HEAD is now at ccf39df Send metrics from thermostats immediately
pi@raspberrypi:~/supla-scripts $ git pull
Already up-to-date.
pi@raspberrypi:~/supla-scripts $ git reset --hard HEAD^
HEAD is now at 027be4e Measure SUPLA API calls
pi@raspberrypi:~/supla-scripts $ git pull
Updating 027be4e..ccf39df
Fast-forward
backend/app/commands/DispatchThermostatCommand.php | 1 +
1 file changed, 1 insertion(+)
pi@raspberrypi:~/supla-scripts $ docker/suplascripts.sh restart
Stopping SUPLA Scripts containers
SUPLA Scripts containers has been stopped.
___ _ _ ___ _ _
/ __| | | | _ \ | /_\
\__ \ |_| | _/ |__ / _ \
|___/\___/|_| |____/_/ \_\
/ __| __ _ _(_)_ __| |_ ___
\__ \/ _| '_| | '_ \ _(_-
|___/\__|_| |_| .__/\__/__/
|_| by @fracz
Starting SUPLA Scripts containers
Pulling suplascripts-db (mysql:5.7)...
5.7: Pulling from library/mysql
ERROR: no matching manifest for unknown in the manifest list entries
pi@raspberrypi:~/supla-scripts $ docker/suplascripts.sh start
___ _ _ ___ _ _
/ __| | | | _ \ | /_\
\__ \ |_| | _/ |__ / _ \
|___/\___/|_| |____/_/ \_\
/ __| __ _ _(_)_ __| |_ ___
\__ \/ _| '_| | '_ \ _(_-
|___/\__|_| |_| .__/\__/__/
|_| by @fracz
Starting SUPLA Scripts containers
Pulling suplascripts-db (mysql:5.7)...
5.7: Pulling from library/mysql
ERROR: no matching manifest for unknown in the manifest list entries
pi@raspberrypi:~/supla-scripts $
Kod: Zaznacz cały
pi@raspberrypi:~ $ cd supla-scripts
pi@raspberrypi:~/supla-scripts $ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working tree clean
pi@raspberrypi:~/supla-scripts $ git branch
* master
pi@raspberrypi:~/supla-scripts $
Niestety...
Kod: Zaznacz cały
pi@raspberrypi:~ $ supla-scripts/docker/suplascripts.sh start
___ _ _ ___ _ _
/ __| | | | _ \ | /_\
\__ \ |_| | _/ |__ / _ \
|___/\___/|_| |____/_/ \_\
/ __| __ _ _(_)_ __| |_ ___
\__ \/ _| '_| | '_ \ _(_-<
|___/\__|_| |_| .__/\__/__/
|_| by @fracz
Starting SUPLA Scripts containers
Pulling suplascripts-db (mysql:5.7)...
5.7: Pulling from library/mysql
ERROR: no matching manifest for unknown in the manifest list entries
pi@raspberrypi:~ $
Kod: Zaznacz cały
COMPOSE_FILE=docker-compose.base.yml:docker-compose.proxy.yml:docker-compose.arm32v7.yml
COMPOSE_FILE=docker-compose.base.yml:docker-compose.proxy.yml:docker-compose.local.yml
Kod: Zaznacz cały
COMPOSE_FILE=docker-compose.base.yml:docker-compose.proxy.yml:docker-compose.arm32v7.yml:docker-compose.local.yml