X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6debc9dd19b3441a974c8eae9788cfa80227badd..857b9529178950df565689d091704b8fc228f2c6:/services/workbench2/docker/Dockerfile diff --git a/services/workbench2/docker/Dockerfile b/services/workbench2/docker/Dockerfile index c394d63288..fa4266191a 100644 --- a/services/workbench2/docker/Dockerfile +++ b/services/workbench2/docker/Dockerfile @@ -13,13 +13,17 @@ RUN apt-get update && \ apt-get clean RUN /usr/bin/gem install --no-document fpm -RUN cd /usr/src && git clone git://git.arvados.org/arvados.git && \ - cd arvados && \ +WORKDIR /usr/src/arvados +COPY . . +RUN cd /usr/src/arvados && \ + test -d cmd/arvados-server || \ + (echo "ERROR: build context must be an Arvados repository" && false) && \ GO_VERSION=$(grep 'goversion =' lib/install/deps.go |awk -F'"' '{print $2}') && \ + ARCH=$(dpkg --print-architecture) && \ echo $GO_VERSION && \ cd /usr/src && \ - wget https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz && \ - tar xzf go${GO_VERSION}.linux-amd64.tar.gz && \ + wget https://golang.org/dl/go${GO_VERSION}.linux-${ARCH}.tar.gz && \ + tar xzf go${GO_VERSION}.linux-${ARCH}.tar.gz && \ ln -s /usr/src/go/bin/go /usr/local/bin/go-${GO_VERSION} && \ ln -s /usr/src/go/bin/gofmt /usr/local/bin/gofmt-${GO_VERSION} && \ ln -s /usr/local/bin/go-${GO_VERSION} /usr/local/bin/go && \