projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15888-remove-py2-from-test' into master
[arvados.git]
/
docker
/
jobs
/
Dockerfile
diff --git
a/docker/jobs/Dockerfile
b/docker/jobs/Dockerfile
index 876ac4f9f49cea14c42f54f1ebe37423b4251cd2..69ea34bc81c412f0ec21d6747db904a163f3000f 100644
(file)
--- a/
docker/jobs/Dockerfile
+++ b/
docker/jobs/Dockerfile
@@
-3,8
+3,8
@@
# SPDX-License-Identifier: Apache-2.0
# Based on Debian Stretch
# SPDX-License-Identifier: Apache-2.0
# Based on Debian Stretch
-FROM debian:
stretch
-slim
-MAINTAINER
Peter Amstutz <peter.amstutz@curii.com
>
+FROM debian:
buster
-slim
+MAINTAINER
Arvados Package Maintainers <packaging@arvados.org
>
ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND noninteractive
@@
-23,12
+23,10
@@
ARG cwl_runner_version
RUN echo cwl_runner_version $cwl_runner_version python_sdk_version $python_sdk_version
RUN apt-get update -q
RUN echo cwl_runner_version $cwl_runner_version python_sdk_version $python_sdk_version
RUN apt-get update -q
-RUN apt-get install -yq --no-install-recommends nodejs \
- python-arvados-python-client=$python_sdk_version \
- python3-arvados-cwl-runner=$cwl_runner_version
+RUN apt-get install -yq --no-install-recommends python3-arvados-cwl-runner=$cwl_runner_version
# use the Python executable from the python-arvados-cwl-runner package
# use the Python executable from the python-arvados-cwl-runner package
-RUN rm -f /usr/bin/python && ln -s /usr/share/python
2.7/dist/python-arvados-python-client
/bin/python /usr/bin/python
+RUN rm -f /usr/bin/python && ln -s /usr/share/python
3/dist/python3-arvados-cwl-runner
/bin/python /usr/bin/python
RUN rm -f /usr/bin/python3 && ln -s /usr/share/python3/dist/python3-arvados-cwl-runner/bin/python /usr/bin/python3
# Install dependencies and set up system.
RUN rm -f /usr/bin/python3 && ln -s /usr/share/python3/dist/python3-arvados-cwl-runner/bin/python /usr/bin/python3
# Install dependencies and set up system.