diff --git a/install.sh b/install.sh index daaed88..74e5e14 100755 --- a/install.sh +++ b/install.sh @@ -161,43 +161,53 @@ install_i3() { } install_docker() { - # https://docs.docker.com/engine/installation/binaries/#install-static-binaries - VERS="18.03.0-ce" + VERS="18.03.1-ce" echo "installing docker binary Version $VERS ..." # https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount - curl -SL https://get.docker.com/builds/Linux/x86_64/docker-$VERS.tgz \ + # omg! you changed the static download URL - AGAIN!??! and removed the checksums? wtf? + # TODO move to apt packages again + # TODO also make sure raspbian/arm setup works. + curl -SL https://download.docker.com/linux/static/stable/x86_64/docker-$VERS.tgz \ -o /tmp/docker.tgz - curl -SL https://get.docker.com/builds/Linux/x86_64/docker-$VERS.tgz.sha256 \ - -o /tmp/docker.tgz.sha256 + # curl -SL https://get.docker.com/builds/Linux/x86_64/docker-$VERS.tgz.sha256 \ + # -o /tmp/docker.tgz.sha256 cd /tmp - if [ ! $(cat /tmp/docker.tgz.sha256 | sha256sum -c -) ]; then - echo "... checksum failed... stopping" - exit 1; - fi + # if [ ! $(cat /tmp/docker.tgz.sha256 | sha256sum -c -) ]; then + # echo "... checksum failed... stopping" + # exit 1; + # fi tar -xvzf docker.tgz mv docker/* /usr/bin rm /tmp/docker.tgz - rm /tmp/docker.tgz.sha256 - - sudo groupadd docker - sudo adduser -aG docker "$USERNAME" + # rm /tmp/docker.tgz.sha256 } install_compose() { - # https://github.com/docker/compose/releases - VERS="1.20.1" + # btw: *not* for raspbian! you got 3 choices: hypriot, install via pip or build yourself + # https://www.berthon.eu/2017/getting-docker-compose-on-raspberry-pi-arm-the-easy-way/ + VERS="1.21.2" + FILE="docker-compose-$(uname -s)-$(uname -m)" echo "installing docker-compose $VERS ... curling from github" - curl -SL "https://github.com/docker/compose/releases/download/${VERS}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/bin/docker-compose + curl -SL "https://github.com/docker/compose/releases/download/${VERS}/${FILE}" -o /tmp/${FILE} - chmod +x /usr/bin/docker-compose + curl -SL "https://github.com/docker/compose/releases/download/${VERS}/${FILE}.sha256" -o /tmp/${FILE}.sha256 + + if [ ! $(cat /tmp/${FILE}.sha256 | sha256sum -c -) ]; then + echo "... checksum failed... stopping" + exit 1; + fi + + chmod +x /tmp/${FILE} + mv /tmp/${FILE} /usr/bin/docker-compose + rm /tmp/${FILE}.sha256 echo "... done"