Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
nopaque
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
Looking for advice? Join the
Matrix channel for GitLab users in Bielefeld
!
Show more breadcrumbs
SFB 1288 - INF
nopaque
Commits
25cb9601
Commit
25cb9601
authored
5 years ago
by
Patrick Jentsch
Browse files
Options
Downloads
Patches
Plain Diff
Rename services in compose.
parent
444e1221
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
config.py
+2
-2
2 additions, 2 deletions
config.py
docker-compose.yml
+7
-11
7 additions, 11 deletions
docker-compose.yml
with
9 additions
and
13 deletions
config.py
+
2
−
2
View file @
25cb9601
...
...
@@ -30,7 +30,7 @@ class DevelopmentConfig(Config):
DEBUG
=
True
'''
### Flask-SQLAlchemy ###
'''
SQLALCHEMY_DATABASE_URI
=
'
postgresql://{}:{}@
opaque_database
/{}
'
.
format
(
SQLALCHEMY_DATABASE_URI
=
'
postgresql://{}:{}@
db
/{}
'
.
format
(
os
.
environ
.
get
(
'
POSTGRES_USER
'
),
os
.
environ
.
get
(
'
POSTGRES_PASSWORD
'
),
os
.
environ
.
get
(
'
POSTGRES_DB_NAME
'
)
...
...
@@ -50,7 +50,7 @@ class TestingConfig(Config):
class
ProductionConfig
(
Config
):
'''
### Flask-SQLAlchemy ###
'''
SQLALCHEMY_DATABASE_URI
=
'
postgresql://{}:{}@
opaque_database
/{}
'
.
format
(
SQLALCHEMY_DATABASE_URI
=
'
postgresql://{}:{}@
db
/{}
'
.
format
(
os
.
environ
.
get
(
'
POSTGRES_USER
'
),
os
.
environ
.
get
(
'
POSTGRES_PASSWORD
'
),
os
.
environ
.
get
(
'
POSTGRES_DB_NAME
'
)
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
7
−
11
View file @
25cb9601
version
:
'
3'
services
:
opaque
:
container_name
:
opaque
web
:
depends_on
:
-
opaque_database
-
opaque_
redis
-
db
-
redis
env_file
:
-
opaque_database.env
-
opaque.env
...
...
@@ -15,23 +14,20 @@ services:
restart
:
always
volumes
:
-
/opaque_storage:/opaque_storage
opaque_daemon
:
container_name
:
opaque_daemon
daemon
:
depends_on
:
-
opaque_database
-
db
env_file
:
opaque_database.env
image
:
gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque_daemon:latest
restart
:
always
volumes
:
-
$HOME/.docker/config.json:/home/opaque_daemon/.docker/config.json
opaque_database
:
container_name
:
opaque_database
db
:
env_file
:
opaque_database.env
image
:
postgres:alpine
restart
:
always
volumes
:
-
/opaque_database:/var/lib/postgresql/data
opaque_redis
:
container_name
:
opaque_redis
redis
:
image
:
redis:alpine
restart
:
always
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