Spearhead/joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feature: support latest prometheus image

Browse Source
This commit is contained in:
geek 2017-08-14 15:38:09 -05:00 committed by Judit Greskovits
parent 9f53c1fa17
commit 55f387e247
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.sh
View File

@ -143,6 +143,7 @@ check() {
echo SDC_URL=${SDC_URL} >> _env echo SDC_URL=${SDC_URL} >> _env
echo SDC_ACCOUNT=${SDC_ACCOUNT} >> _env echo SDC_ACCOUNT=${SDC_ACCOUNT} >> _env
echo SDC_KEY_ID=${SDC_KEY_ID} >> _env echo SDC_KEY_ID=${SDC_KEY_ID} >> _env
echo TRITON_ACCOUNT=${TRITON_USER} >> _env
echo TRITON_USER=${TRITON_USER} >> _env echo TRITON_USER=${TRITON_USER} >> _env
echo TRITON_DC=${TRITON_DC} >> _env echo TRITON_DC=${TRITON_DC} >> _env
echo CONSUL=copilot-consul.svc.${TRITON_ACCOUNT}.${TRITON_DC}.cns.joyent.com >> _env echo CONSUL=copilot-consul.svc.${TRITON_ACCOUNT}.${TRITON_DC}.cns.joyent.com >> _env

2
triton-compose.yml
View File

@ -28,7 +28,7 @@ consul:
# it is included here for demo purposes and is not required # it is included here for demo purposes and is not required
############################################################################# #############################################################################
prometheus: prometheus:
image: autopilotpattern/prometheus:1.7.1-r20 image: autopilotpattern/prometheus:1.7.1-r24
restart: always restart: always
mem_limit: 1g mem_limit: 1g
ports: ports: