From 42d33cf5957cd26879590ccd0abeddff1673283c Mon Sep 17 00:00:00 2001 From: 1138-4EB <1138-4EB@users.noreply.github.com> Date: Mon, 2 Jul 2018 04:21:58 +0100 Subject: [PATCH] add docker static client to filebrowser/dev Former-commit-id: c9e14d35f42c240caf16c7ffaf03b56dac75588f [formerly bf92002b6cac66b3fca8fd68e7a19284983973d1] [formerly 3954699af9e3dad46a0026b07fd5ebb13796fabd [formerly 7459e66b717ebcdba7a34a3a4e0a351d6dcd1a0f]] Former-commit-id: 8f65bfb661773bd587243e84e9381d0e9a77ff50 [formerly 72cb26e555e2dd113a7c7e77fff71ae0abf440de] Former-commit-id: dfe6091913bbcaf6bd87f8e1f3b06d5d5c84d14e --- .travis.yml | 2 +- dockerfiles/dev | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dbe2fb3e..54b20e39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ jobs: script: - cp dockerfiles/filebrowser Dockerfile - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin - - docker run --rm -itv $(pwd):$WDIR filebrowser/dev goreleaser + - docker run --rm -itv $(pwd):$WDIR -v /var/run/docker.sock:/var/run/docker.sock filebrowser/dev goreleaser - docker logout if: tag IS present deploy: diff --git a/dockerfiles/dev b/dockerfiles/dev index ceb19ac0..0761a949 100644 --- a/dockerfiles/dev +++ b/dockerfiles/dev @@ -22,4 +22,6 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/reposit ) && \ chmod +x /go/bin/dep && \ curl -sL https://git.io/goreleaser -o /go/bin/goreleaser && \ - chmod +x /go/bin/goreleaser + chmod +x /go/bin/goreleaser && \ + curl -fsSL https://download.docker.com/linux/static/edge/x86_64/docker-18.05.0-ce.tgz | tar xvz --strip-components=1 docker/docker -C /usr/local/bin && \ + chmod +x /usr/local/bin/docker