-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7bd82dc
commit f9faa24
Showing
6 changed files
with
73 additions
and
187 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
diff --git a/Dockerfile b/Dockerfile | ||
index cb18d17..ba490eb 100644 | ||
--- a/Dockerfile | ||
+++ b/Dockerfile | ||
@@ -27,5 +27,7 @@ COPY --chown=hpcperfstats:hpcperfstats . . | ||
|
||
RUN pip install . | ||
|
||
+RUN mkdir -p /hpcperfstats/ | ||
+ | ||
ADD services-conf/supervisord.conf /etc/supervisor/conf.d/supervisord.conf | ||
|
||
diff --git a/docker-compose.yml b/docker-compose.yml | ||
index 62abe4d..4030d67 100644 | ||
--- a/docker-compose.yml | ||
+++ b/docker-compose.yml | ||
@@ -5,6 +5,8 @@ services: | ||
command: /home/hpcperfstats/services-conf/django_startup.sh | ||
env_file: | ||
- ./.env.dev | ||
+ volumes: | ||
+ - hpcperfstatsweblog:/hpcperfstats/log/ | ||
|
||
pipeline: | ||
image: hpcperfstats | ||
@@ -52,10 +54,17 @@ volumes: | ||
postgres_data: | ||
|
||
rabbitmq_messages: | ||
- | ||
+ | ||
hpcperfstatsdata: | ||
driver: local | ||
driver_opts: | ||
type: none | ||
device: /home/sharrell/compose_test/hpcperfstats_data/ | ||
o: bind | ||
+ | ||
+ hpcperfstatsweblog: | ||
+ driver: local | ||
+ driver_opts: | ||
+ type: none | ||
+ device: /home/sharrell/compose_test/hpcperfstats_weblog/ | ||
+ o: bind | ||
diff --git a/hpcperfstats/site/hpcperfstats_site/settings.py b/hpcperfstats/site/hpcperfstats_site/settings.py | ||
index ee9b4d3..f7c44ac 100644 | ||
--- a/hpcperfstats/site/hpcperfstats_site/settings.py | ||
+++ b/hpcperfstats/site/hpcperfstats_site/settings.py | ||
@@ -215,7 +215,7 @@ LOGGING = { | ||
'logfile': { | ||
'level':'INFO', | ||
'class':'logging.handlers.RotatingFileHandler', | ||
- 'filename': os.path.join('/tmp', 'hpcperfstats_site.log'), | ||
+ 'filename': os.path.join('/hpcperfstats/log/', 'hpcperfstats_site.log'), | ||
'maxBytes': 1024*1024*15, # 15MB | ||
'backupCount': 10, | ||
}, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters