Compare commits

..

No commits in common. "3893216a8b5353849665dc0541edb20e5aa339b3" and "4ffdaea8d336b485bc9ebdf28c0cea8d5f5d7d08" have entirely different histories.

2 changed files with 9 additions and 39 deletions

View file

@ -88,7 +88,7 @@ steps:
- ssh -o StrictHostKeyChecking=no - ssh -o StrictHostKeyChecking=no
-i ~/.ssh/deploy_key -i ~/.ssh/deploy_key
"$SSH_USER@$SSH_HOST" "$SSH_USER@$SSH_HOST"
git:from-image objectstorage git:from-image automation
"glenux/service-garage:${DRONE_COMMIT_SHA:0:8}" "glenux/service-garage:${DRONE_COMMIT_SHA:0:8}"
# #

View file

@ -14,10 +14,6 @@ Setup internal network
dokku network:create objstorage_net dokku network:create objstorage_net
dokku network:set code attach-post-create objstorage_net dokku network:set code attach-post-create objstorage_net
Deploy image
dokku git:from-image automation glenux/service-garage:xxxx
Setup proxy Setup proxy
dokku proxy:ports-clear objstorage dokku proxy:ports-clear objstorage
@ -26,9 +22,9 @@ Setup storage
dokku storage:mount objstorage /var/lib/dokku/data/storage/cloud/apps:/var/www/html/apps dokku storage:mount objstorage /var/lib/dokku/data/storage/cloud/apps:/var/www/html/apps
Restart Deploy image
dokku ps:restart objstorage dokku git:from-image automation glenux/service-garage:xxxx
### Web relay ### Web relay
@ -36,37 +32,23 @@ Create app
dokku apps:create objstorage-web dokku apps:create objstorage-web
Setup internal network
dokku network:set objstorage-web attach-post-create objstorage_net
Setup domain Setup domain
dokku domains:add objstorage-web web.apps.example.com dokku domains:add objstorage-web web.apps.example.com
dokku domains:add objstorage-web *.web.apps.example.com dokku domains:add objstorage-web *.web.apps.example.com
Setup proxy
dokku proxy:ports-clear objstorage-web
dokku proxy: FIXME: setup proxy ports
Setup TLS Setup TLS
dokku config:set --no-restart objstorage-web DOKKU_LETSENCRYPT_EMAIL=username@example.com dokku config:set --no-restart objstorage-web DOKKU_LETSENCRYPT_EMAIL=username@example.com
dokku letsencrypt:enable objstorage-web dokku letsencrypt:enable objstorage-web
Configure docker options Configure docker options
dokku config:set objstorage-web DOKKU_DOCKERFILE_START_CMD="tcp-listen:FIXME:port,fork,reuseaddr tcp-connect:objstorage:FIXME:port" dokku config:set objstorage-web DOKKU_DOCKERFILE_START_CMD="FIXME: command for socat"
Deploy image Deploy image
dokku git:from-image objstorage-web alpine/socat:xxxx dokku git:from-image automation alpine/socat:xxxx
Restart
dokku ps:restart objstorage-web
### S3 relay ### S3 relay
@ -74,24 +56,11 @@ Create app
dokku apps:create objstorage-s3 dokku apps:create objstorage-s3
Setup internal network
dokku network:set objstorage-web attach-post-create objstorage_net
Deploy image
dokku git:from-image objstorage-s3 alpine/socat:xxxx
Setup domain Setup domain
dokku domains:add objstorage s3.apps.example.com dokku domains:add objstorage s3.apps.example.com
dokku domains:add objstorage *.s3.apps.example.com dokku domains:add objstorage *.s3.apps.example.com
Setup proxy
dokku proxy:ports-clear objstorage-web
dokku proxy: FIXME: setup proxy ports
Setup TLS Setup TLS
dokku config:set --no-restart objstorage DOKKU_LETSENCRYPT_EMAIL=username@example.com dokku config:set --no-restart objstorage DOKKU_LETSENCRYPT_EMAIL=username@example.com
@ -99,9 +68,10 @@ Setup TLS
Configure docker options Configure docker options
dokku config:set objstorage-web DOKKU_DOCKERFILE_START_CMD="tcp-listen:FIXME:port,fork,reuseaddr tcp-connect:objstorage:FIXME:port" dokku config:set objstorage-web DOKKU_DOCKERFILE_START_CMD="FIXME: command for socat"
Restart Deploy image
dokku git:from-image automation alpine/socat:xxxx
dokku ps:restart objstorage-s3