markdumay/synology-docker

docker-compose not copied correctly

doctorpangloss opened this issue · 1 comments

doctorpangloss@diskstation-1:~/synology-docker$ sudo ./syno_docker_update.sh --force download ./docker
Update Docker Engine and Docker Compose on Synology to target version

Current DSM version: 6.2.3
Current Docker version: Unknown
Current Docker Compose version: Unknown
Target Docker version: 19.03.12
Target Docker Compose version: 1.26.2
Step 1 from 2: Downloading target Docker binary (https://download.docker.com/linux/static/stable/x86_64/docker-19.03.12.tgz)
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100 57.9M  100 57.9M    0     0  80.7M      0 --:--:-- --:--:-- --:--:-- 80.7M
Step 2 from 2: Downloading target Docker Compose binary (https://github.com/docker/compose/releases/download/1.26.2/docker-compose-Linux-x86_64)
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100   638  100   638    0     0   1923      0 --:--:-- --:--:-- --:--:--  1927
100 11.6M  100 11.6M    0     0  5988k      0  0:00:01  0:00:01 --:--:-- 7569k
Done.

Observe the install command fails to copy docker-compose (it was downloaded correctly)

doctorpangloss@diskstation-1:~/synology-docker$ sudo ./syno_docker_update.sh --force install ./docker
Update Docker Engine and Docker Compose on Synology to target version

Current DSM version: 6.2.3
Current Docker version: Unknown
Current Docker Compose version: Unknown
Target Docker version: 19.03.12
Target Docker Compose version: Unknown
Step 1 from 6: Stopping Docker service
Step 2 from 6: Backing up current Docker binaries (/volume1/homes/doctorpangloss/synology-docker/docker_backup_20200703_123301.tgz)
bin/
bin/containerd-shim
bin/docker-proxy
bin/dockerd
bin/docker
bin/auplink
bin/docker-compose
bin/ctr
bin/containerd
bin/runc
bin/docker-init
dockerd.json
Step 3 from 6: Extracting target Docker binary (/volume1/homes/doctorpangloss/synology-docker/docker/docker-19.03.12.tgz)
docker/
docker/containerd-shim
docker/docker
docker/dockerd
docker/docker-init
docker/runc
docker/docker-proxy
docker/containerd
docker/ctr
Step 4 from 6: Installing binaries
cp: cannot stat ‘/tmp/docker_update/docker-compose’: No such file or directory
Step 5 from 6: Configuring log driver
Step 6 from 6: Starting Docker service
pkgctl-Docker started.

It seems the function execute_install_bin() uses the wrong source directory for the docker-compose binary. It wrongfully ignores the provided ./docker path. I created a new branch called install, care to test if it works correctly now?