Skip to content

Commit

Permalink
Update marathon.json
Browse files Browse the repository at this point in the history
  • Loading branch information
h0tbird committed Jan 25, 2016
1 parent f6b3727 commit ff343b8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ MAINTAINER Marc Villacorta Morera <[email protected]>
# Environment variables:
#------------------------------------------------------------------------------

ENV PORTUS_VERSION="master" \
ENV PORTUS_VERSION="2.0.0" \
NOKOGIRI_USE_SYSTEM_LIBRARIES="1"

#------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion bin/marathon
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

[ $# -ne 1 ] && echo "Usage: $0 <start|restart|destroy>" && exit 1
[ $# -ne 1 ] && echo "Usage: $0 <start|deploy|destroy>" && exit 1
[ -z "${MARATHON_URL}" ] && echo 'Ops! MARATHON_URL is not set' && exit 1

case $1 in
Expand Down
11 changes: 9 additions & 2 deletions marathon.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,25 @@
"container": {
"type": "DOCKER",
"docker": {
"image": "h0tbird/portus:v2.0.0-1",
"image": "h0tbird/portus:v2.0.0-2",
"network": "BRIDGE",
"portMappings": [
{ "containerPort": 80, "hostPort": 0 }
],
"privileged": false,
"parameters": [
{ "key": "env", "value": "PORTUS_PORT=80" },
{ "key": "env", "value": "DB_ADAPTER=mysql2" },
{ "key": "env", "value": "DB_ENCODING=utf8" },
{ "key": "env", "value": "DB_HOST=db-portus-sys.marathon.cell-1.mad.mesos" },
{ "key": "env", "value": "DB_PORT=3306" },
{ "key": "env", "value": "DB_USERNAME=portus" },
{ "key": "env", "value": "DB_PASSWORD=portus" },
{ "key": "env", "value": "DB_DATABASE=portus" }
{ "key": "env", "value": "DB_DATABASE=portus" },
{ "key": "env", "value": "SECRETS_SECRET_KEY_BASE=secret-goes-here" },
{ "key": "env", "value": "SECRETS_ENCRYPTION_PRIVATE_KEY_PATH=/certs/server.key" },
{ "key": "env", "value": "SECRETS_MACHINE_FQDN=web-portus-sys.marathon" },
{ "key": "env", "value": "SECRETS_PORTUS_PASSWORD=portus" }
],
"forcePullImage": true
}
Expand Down

0 comments on commit ff343b8

Please sign in to comment.