Skip to content

Commit

Permalink
Merge pull request #451 from uw-it-aca/feature/prometheus-monitoring
Browse files Browse the repository at this point in the history
Feature/prometheus monitoring
  • Loading branch information
mikeseibel committed Oct 29, 2020
2 parents 609be7e + 481db57 commit c43c8ae
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM acait/django-container:1.1.16 as app-container
FROM acait/django-container:1.1.17 as app-container

USER root
RUN apt-get update && apt-get install mysql-client libmysqlclient-dev -y
Expand All @@ -25,7 +25,7 @@ RUN . /app/bin/activate && pip install nodeenv && nodeenv -p &&\
RUN . /app/bin/activate && python manage.py collectstatic --noinput &&\
python manage.py compress -f

FROM acait/django-test-container:1.1.16 as app-test-container
FROM acait/django-test-container:1.1.17 as app-test-container

COPY --from=app-container /app/ /app/
COPY --from=app-container /static/ /static/
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ services:
- ./sis_provisioner:/app/sis_provisioner
ports:
- "8000:8000"
- "8001:8001"

0 comments on commit c43c8ae

Please sign in to comment.