Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
docker
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bioroboticslab
robofish
docker
Commits
dc9ee1a9
Commit
dc9ee1a9
authored
4 years ago
by
calrama
Browse files
Options
Downloads
Patches
Plain Diff
[ubuntu,jupyterhub] unify pip and setuptools installation
parent
1df5efbb
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
jupyterhub/base/Dockerfile
+4
-3
4 additions, 3 deletions
jupyterhub/base/Dockerfile
ubuntu/Dockerfile
+6
-1
6 additions, 1 deletion
ubuntu/Dockerfile
with
10 additions
and
4 deletions
jupyterhub/base/Dockerfile
+
4
−
3
View file @
dc9ee1a9
...
...
@@ -44,9 +44,10 @@ RUN python${JUPYTERHUB_PYTHON_VERSION} -m pip --no-cache-dir install \
RUN
mkdir
-p
/usr/local/venv
&&
\
python
${
JUPYTERHUB_PYTHON_VERSION
}
-m
venv /usr/local/venv/default
&&
\
.
/usr/local/venv/default/bin/activate
&&
\
python
${
JUPYTERHUB_PYTHON_VERSION
}
-m
pip
--no-cache-dir
install
--upgrade
pip
==
20.2.3
&&
\
pip
--no-cache-dir
install
--upgrade
setuptools
==
49.1.0
&&
\
pip
install
tensorflow
==
1.15.3
&&
\
python
${
JUPYTERHUB_PYTHON_VERSION
}
-m
pip
--no-cache-dir
install
--upgrade
\
pip
==
${
PYTHON_PIP_VERSION
}
\
setuptools
==
${
PYTHON_SETUPTOOLS_VERSION
}
&&
\
pip
--no-cache-dir
install
tensorflow
==
1.15.3
&&
\
pip
--no-cache-dir
install
\
wheel
\
black
\
...
...
This diff is collapsed.
Click to expand it.
ubuntu/Dockerfile
+
6
−
1
View file @
dc9ee1a9
...
...
@@ -105,4 +105,9 @@ RUN apt-get install -y \
ADD
agki-nas01.imp.fu-berlin.de-ca-cert.crt /usr/local/share/ca-certificates/agki-nas01.imp.fu-berlin.de-ca-cert.crt
RUN
update-ca-certificates
COPY
pip.conf /etc/
RUN
python3
-m
pip
install
--upgrade
pip
==
20.2.3
ENV
PYTHON_PIP_VERSION=20.2.3
ENV
PYTHON_SETUPTOOLS_VERSION=50.3.0
RUN
python3
-m
pip
install
--upgrade
\
pip
==
${
PYTHON_PIP_VERSION
}
\
setuptools
==
${
PYTHON_SETUPTOOLS_VERSION
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment