Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
csentry
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue 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
ICS Control System Infrastructure
csentry
Commits
6e02fd10
Commit
6e02fd10
authored
6 years ago
by
Benjamin Bertrand
Browse files
Options
Downloads
Patches
Plain Diff
Use dev image for development
parent
427b8f1a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile
+4
-0
4 additions, 0 deletions
Dockerfile
docker-compose.override.yml
+5
-2
5 additions, 2 deletions
docker-compose.override.yml
docker-compose.yml
+1
-1
1 addition, 1 deletion
docker-compose.yml
with
10 additions
and
3 deletions
Dockerfile
+
4
−
0
View file @
6e02fd10
...
@@ -38,6 +38,10 @@ RUN python -m venv /venv \
...
@@ -38,6 +38,10 @@ RUN python -m venv /venv \
&&
.
/venv/bin/activate
\
&&
.
/venv/bin/activate
\
&&
pip
install
--no-cache-dir
-r
/requirements.txt
&&
pip
install
--no-cache-dir
-r
/requirements.txt
ARG
CSENTRY_BUILD
COPY
requirements-dev.txt /requirements-dev.txt
RUN if
[
"
$CSENTRY_BUILD
"
=
"DEV"
]
;
then
/venv/bin/pip
install
--no-cache-dir
-r
/requirements-dev.txt
;
fi
FROM
base
FROM
base
RUN
groupadd
-r
-g
1000 csi
\
RUN
groupadd
-r
-g
1000 csi
\
...
...
This diff is collapsed.
Click to expand it.
docker-compose.override.yml
+
5
−
2
View file @
6e02fd10
version
:
'
2
'
version
:
'
3
'
services
:
services
:
web
:
web
:
build
:
.
build
:
context
:
.
args
:
CSENTRY_BUILD
:
DEV
environment
:
environment
:
LOCAL_SETTINGS
:
/app/settings.cfg
LOCAL_SETTINGS
:
/app/settings.cfg
FLASK_APP
:
/app/wsgi.py
FLASK_APP
:
/app/wsgi.py
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
1
−
1
View file @
6e02fd10
version
:
'
2
'
version
:
'
3
'
services
:
services
:
web
:
web
:
image
:
registry.esss.lu.se/ics-infrastructure/csentry:master
image
:
registry.esss.lu.se/ics-infrastructure/csentry:master
...
...
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