projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21507: removed word wrap on collection owner field Arvados-DCO-1.1-Signed-off-by...
[arvados.git]
/
services
/
workbench2
/
docker
/
Dockerfile
diff --git
a/services/workbench2/docker/Dockerfile
b/services/workbench2/docker/Dockerfile
index 4942ca0a5798fa26d637929a5270f6da3a098cd8..fa4266191aa0c3f8998cc92f879ba4195b6aef4a 100644
(file)
--- a/
services/workbench2/docker/Dockerfile
+++ b/
services/workbench2/docker/Dockerfile
@@
-2,10
+2,10
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.0
-FROM node:12.22.
3-buster
+FROM node:12.22.
12-bullseye
LABEL maintainer="Arvados Package Maintainers <packaging@arvados.org>"
LABEL maintainer="Arvados Package Maintainers <packaging@arvados.org>"
-RUN echo deb http://deb.debian.org/debian bu
ster
-backports main >> /etc/apt/sources.list.d/backports.list
+RUN echo deb http://deb.debian.org/debian bu
llseye
-backports main >> /etc/apt/sources.list.d/backports.list
RUN apt-get update && \
apt-get -yq --no-install-recommends -o Acquire::Retries=6 install \
libsecret-1-0 libsecret-1-dev rpm ruby ruby-dev rubygems build-essential \
RUN apt-get update && \
apt-get -yq --no-install-recommends -o Acquire::Retries=6 install \
libsecret-1-0 libsecret-1-dev rpm ruby ruby-dev rubygems build-essential \
@@
-13,13
+13,17
@@
RUN apt-get update && \
apt-get clean
RUN /usr/bin/gem install --no-document fpm
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}') && \
GO_VERSION=$(grep 'goversion =' lib/install/deps.go |awk -F'"' '{print $2}') && \
+ ARCH=$(dpkg --print-architecture) && \
echo $GO_VERSION && \
cd /usr/src && \
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 && \
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 && \