Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
flamenco-worker-python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
blender
flamenco-worker-python
Commits
8be65799
Commit
8be65799
authored
9 years ago
by
Francesco Siddi
Browse files
Options
Downloads
Patches
Plain Diff
Dashboard: updates to Dockerfiles
parent
0ea515f0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker/dashboard/dev/Dockerfile
+1
-3
1 addition, 3 deletions
docker/dashboard/dev/Dockerfile
docker/dashboard/pro/Dockerfile
+5
-3
5 additions, 3 deletions
docker/dashboard/pro/Dockerfile
with
6 additions
and
6 deletions
docker/dashboard/dev/Dockerfile
+
1
−
3
View file @
8be65799
...
...
@@ -21,13 +21,12 @@ npm
RUN
mkdir
-p
/data/git/dashboard
\
&&
mkdir
-p
/data/storage/shared
\
&&
mkdir
-p
/data/storage/dashboard
\
&&
mkdir
-p
/data/bins/
\
&&
mkdir
-p
/data/config
RUN
pip
install
virtualenv
\
&&
virtualenv /data/venv
ENV
PIP_PACKAGES_VERSION
=
1
ENV
PIP_PACKAGES_VERSION 1
ADD
requirements.txt /requirements.txt
RUN
.
/data/venv/bin/activate
&&
pip
install
-r
/requirements.txt
...
...
@@ -36,7 +35,6 @@ VOLUME /data/git/dashboard
VOLUME
/data/config
VOLUME
/data/storage/shared
VOLUME
/data/storage/dashboard
VOLUME
/data/bins
EXPOSE
8888
...
...
This diff is collapsed.
Click to expand it.
docker/dashboard/pro/Dockerfile
+
5
−
3
View file @
8be65799
...
...
@@ -14,6 +14,9 @@ libmysqlclient-dev \
libssl-dev
\
libffi-dev
\
software-properties-common
\
nodejs
\
nodejs-legacy
\
npm
\
apache2-mpm-event
\
libapache2-mod-wsgi
\
libapache2-mod-xsendfile
...
...
@@ -21,7 +24,6 @@ libapache2-mod-xsendfile
RUN
mkdir
-p
/data/git/dashboard
\
&&
mkdir
-p
/data/storage/shared
\
&&
mkdir
-p
/data/storage/dashboard
\
&&
mkdir
-p
/data/bins/
\
&&
mkdir
-p
/data/config
ENV
APACHE_RUN_USER www-data
...
...
@@ -36,12 +38,12 @@ RUN mkdir -p $APACHE_RUN_DIR $APACHE_LOCK_DIR $APACHE_LOG_DIR
RUN
pip
install
virtualenv
\
&&
virtualenv /data/venv
ENV
PIP_PACKAGES_VERSION
=
2
ENV
PIP_PACKAGES_VERSION 2
ADD
requirements.txt /requirements.txt
RUN
.
/data/venv/bin/activate
&&
pip
install
-r
/requirements.txt
VOLUME
/data/git/
pill
ar
VOLUME
/data/git/
dashbo
ar
d
VOLUME
/data/config
VOLUME
/data/storage/shared
VOLUME
/data/storage/dashboard
...
...
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