Release 1.14.1

fix: ensure cloned/renamed apps have a link to linked services
Previously they would just 'disappear', resulting in broken applications until the app was relinked to the service in question. Closes dokku/dokku-redis#142
2021-09-13 04:34:07 -04:00 · 2021-09-13 04:28:33 -04:00 · 2021-09-13 04:25:15 -04:00 · 2021-09-13 10:21:29 +02:00 · 2021-09-13 03:34:06 -04:00 · 2021-09-13 03:27:29 -04:00
45 changed files with 544 additions and 255 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,7 +1,7 @@
 FROM dokku/dokku:latest

 RUN apt-get update
-RUN apt-get install --no-install-recommends -y build-essential && \
+RUN apt-get install --no-install-recommends -y build-essential file nano && \
  apt-get clean autoclean && \
  apt-get autoremove --yes && \
  rm -rf /var/lib/apt/lists/* && \
--- a/README.md
+++ b/README.md
@@ -18,14 +18,14 @@ sudo dokku plugin:install https://github.com/dokku/dokku-postgres.git postgres

 ```
 postgres:app-links <app>                           # list all postgres service links for a given app
-postgres:backup <service> <bucket-name> [--use-iam] # creates a backup of the postgres service to an existing s3 bucket
-postgres:backup-auth <service> <aws-access-key-id> <aws-secret-access-key> <aws-default-region> <aws-signature-version> <endpoint-url> # sets up authentication for backups on the postgres service
-postgres:backup-deauth <service>                   # removes backup authentication for the postgres service
-postgres:backup-schedule <service> <schedule> <bucket-name> [--use-iam] # schedules a backup of the postgres service
+postgres:backup <service> <bucket-name> [--use-iam] # create a backup of the postgres service to an existing s3 bucket
+postgres:backup-auth <service> <aws-access-key-id> <aws-secret-access-key> <aws-default-region> <aws-signature-version> <endpoint-url> # set up authentication for backups on the postgres service
+postgres:backup-deauth <service>                   # remove backup authentication for the postgres service
+postgres:backup-schedule <service> <schedule> <bucket-name> [--use-iam] # schedule a backup of the postgres service
 postgres:backup-schedule-cat <service>             # cat the contents of the configured backup cronfile for the service
-postgres:backup-set-encryption <service> <passphrase> # sets encryption for all future backups of postgres service
-postgres:backup-unschedule <service>               # unschedules the backup of the postgres service
-postgres:backup-unset-encryption <service>         # unsets encryption for future backups of the postgres service
+postgres:backup-set-encryption <service> <passphrase> # set encryption for all future backups of postgres service
+postgres:backup-unschedule <service>               # unschedule the backup of the postgres service
+postgres:backup-unset-encryption <service>         # unset encryption for future backups of the postgres service
 postgres:clone <service> <new-service> [--clone-flags...] # create container <new-name> then copy data from <name> into <new-name>
 postgres:connect <service>                         # connect to the service via the postgres connection tool
 postgres:create <service> [--create-flags...]      # create a postgres service
@@ -33,7 +33,7 @@ postgres:destroy <service> [-f|--force]            # delete the postgres service
 postgres:enter <service>                           # enter or run a command in a running postgres service container
 postgres:exists <service>                          # check if the postgres service exists
 postgres:export <service>                          # export a dump of the postgres service database
-postgres:expose <service> <ports...>               # expose a postgres service on custom port if provided (random port otherwise)
+postgres:expose <service> <ports...>               # expose a postgres service on custom host:port if provided (random port on the 0.0.0.0 interface if otherwise unspecified)
 postgres:import <service>                          # import a dump into the postgres service database
 postgres:info <service> [--single-info-flag]       # print the service information
 postgres:link <service> <app> [--link-flags...]    # link the postgres service to the app
@@ -52,7 +52,7 @@ postgres:upgrade <service> [--upgrade-flags...]    # upgrade service <service> t

 ## Usage

-Help for any commands can be displayed by specifying the command as an argument to postgres:help. Please consult the `postgres:help` command for any undocumented commands.
+Help for any commands can be displayed by specifying the command as an argument to postgres:help. Plugin help output in conjunction with any files in the `docs/` folder is used to generate the plugin documentation. Please consult the `postgres:help` command for any undocumented commands.

 ### Basic Usage

@@ -65,31 +65,40 @@ dokku postgres:create <service> [--create-flags...]

 flags:

+- `-c|--config-options "--args --go=here"`: extra arguments to pass to the container create command (default: `None`)
 - `-C|--custom-env "USER=alpha;HOST=beta"`: semi-colon delimited environment variables to start the service with
 - `-i|--image IMAGE`: the image name to start the service with
 - `-I|--image-version IMAGE_VERSION`: the image version to start the service with
+- `-m|--memory MEMORY`: container memory limit (default: unlimited)
 - `-p|--password PASSWORD`: override the user-level service password
 - `-r|--root-password PASSWORD`: override the root-level service password
+- `-s|--shm-size SHM_SIZE`: override shared memory size for postgres docker container

-Create a postgres service named lolipop:
+Create a postgres service named lollipop:

 ```shell
-dokku postgres:create lolipop
+dokku postgres:create lollipop
 ```

 You can also specify the image and image version to use for the service. It *must* be compatible with the postgres image.

 ```shell
-export DATABASE_IMAGE="postgres"
-export DATABASE_IMAGE_VERSION="${PLUGIN_IMAGE_VERSION}"
-dokku postgres:create lolipop
+export POSTGRES_IMAGE="postgres"
+export POSTGRES_IMAGE_VERSION="${PLUGIN_IMAGE_VERSION}"
+dokku postgres:create lollipop
 ```

 You can also specify custom environment variables to start the postgres service in semi-colon separated form.

 ```shell
-export DATABASE_CUSTOM_ENV="USER=alpha;HOST=beta"
-dokku postgres:create lolipop
+export POSTGRES_CUSTOM_ENV="USER=alpha;HOST=beta"
+dokku postgres:create lollipop
+```
+
+Official Postgres docker images does not include postgis extension (amongst others). The following example creates a new postgres service using `postgis/postgis:13-3.1` image, which includes the `postgis` extension.
+
+```shell
+dokku postgres:create postgis-database --image "postgis/postgis" --image-version "13-3.1"
 ```

 ### print the service information
@@ -115,22 +124,22 @@ flags:
 Get connection information as follows:

 ```shell
-dokku postgres:info lolipop
+dokku postgres:info lollipop
 ```

 You can also retrieve a specific piece of service info via flags:

 ```shell
-dokku postgres:info lolipop --config-dir
-dokku postgres:info lolipop --data-dir
-dokku postgres:info lolipop --dsn
-dokku postgres:info lolipop --exposed-ports
-dokku postgres:info lolipop --id
-dokku postgres:info lolipop --internal-ip
-dokku postgres:info lolipop --links
-dokku postgres:info lolipop --service-root
-dokku postgres:info lolipop --status
-dokku postgres:info lolipop --version
+dokku postgres:info lollipop --config-dir
+dokku postgres:info lollipop --data-dir
+dokku postgres:info lollipop --dsn
+dokku postgres:info lollipop --exposed-ports
+dokku postgres:info lollipop --id
+dokku postgres:info lollipop --internal-ip
+dokku postgres:info lollipop --links
+dokku postgres:info lollipop --service-root
+dokku postgres:info lollipop --status
+dokku postgres:info lollipop --version
 ```

 ### list all postgres services
@@ -160,13 +169,13 @@ flags:
 You can tail logs for a particular service:

 ```shell
-dokku postgres:logs lolipop
+dokku postgres:logs lollipop
 ```

 By default, logs will not be tailed, but you can do this with the --tail flag:

 ```shell
-dokku postgres:logs lolipop --tail
+dokku postgres:logs lollipop --tail
 ```

 ### link the postgres service to the app
@@ -181,32 +190,32 @@ flags:
 - `-a|--alias "BLUE_DATABASE"`: an alternative alias to use for linking to an app via environment variable
 - `-q|--querystring "pool=5"`: ampersand delimited querystring arguments to append to the service link

-A postgres service can be linked to a container. This will use native docker links via the docker-options plugin. Here we link it to our 'playground' app. 
+A postgres service can be linked to a container. This will use native docker links via the docker-options plugin. Here we link it to our `playground` app.

 > NOTE: this will restart your app

 ```shell
-dokku postgres:link lolipop playground
+dokku postgres:link lollipop playground
 ```

 The following environment variables will be set automatically by docker (not on the app itself, so they won’t be listed when calling dokku config):

 ```
-DOKKU_DATABASE_LOLIPOP_NAME=/lolipop/DATABASE
-DOKKU_DATABASE_LOLIPOP_PORT=tcp://172.17.0.1:5432
-DOKKU_DATABASE_LOLIPOP_PORT_5432_TCP=tcp://172.17.0.1:5432
-DOKKU_DATABASE_LOLIPOP_PORT_5432_TCP_PROTO=tcp
-DOKKU_DATABASE_LOLIPOP_PORT_5432_TCP_PORT=5432
-DOKKU_DATABASE_LOLIPOP_PORT_5432_TCP_ADDR=172.17.0.1
+DOKKU_POSTGRES_LOLLIPOP_NAME=/lollipop/DATABASE
+DOKKU_POSTGRES_LOLLIPOP_PORT=tcp://172.17.0.1:5432
+DOKKU_POSTGRES_LOLLIPOP_PORT_5432_TCP=tcp://172.17.0.1:5432
+DOKKU_POSTGRES_LOLLIPOP_PORT_5432_TCP_PROTO=tcp
+DOKKU_POSTGRES_LOLLIPOP_PORT_5432_TCP_PORT=5432
+DOKKU_POSTGRES_LOLLIPOP_PORT_5432_TCP_ADDR=172.17.0.1
 ```

 The following will be set on the linked application by default:

 ```
-DATABASE_URL=postgres://lolipop:SOME_PASSWORD@dokku-postgres-lolipop:5432/lolipop
+DATABASE_URL=postgres://lollipop:SOME_PASSWORD@dokku-postgres-lollipop:5432/lollipop
 ```

-The host exposed here only works internally in docker containers. If you want your container to be reachable from outside, you should use the 'expose' subcommand. Another service can be linked to your app:
+The host exposed here only works internally in docker containers. If you want your container to be reachable from outside, you should use the `expose` subcommand. Another service can be linked to your app:

 ```shell
 dokku postgres:link other_service playground
@@ -216,13 +225,13 @@ It is possible to change the protocol for `DATABASE_URL` by setting the environm

 ```shell
 dokku config:set playground POSTGRES_DATABASE_SCHEME=postgres2
-dokku postgres:link lolipop playground
+dokku postgres:link lollipop playground
 ```

 This will cause `DATABASE_URL` to be set as:

 ```
-postgres2://lolipop:SOME_PASSWORD@dokku-postgres-lolipop:5432/lolipop
+postgres2://lollipop:SOME_PASSWORD@dokku-postgres-lollipop:5432/lollipop
 ```

 ### unlink the postgres service from the app
@@ -237,7 +246,7 @@ You can unlink a postgres service:
 > NOTE: this will restart your app and unset related environment variables

 ```shell
-dokku postgres:unlink lolipop playground
+dokku postgres:unlink lollipop playground
 ```

 ### Service Lifecycle
@@ -253,8 +262,10 @@ dokku postgres:connect <service>

 Connect to the service via the postgres connection tool:

+> NOTE: disconnecting from ssh while running this command may leave zombie processes due to moby/moby#9098
+
 ```shell
-dokku postgres:connect lolipop
+dokku postgres:connect lollipop
 ```

 ### enter or run a command in a running postgres service container
@@ -266,17 +277,19 @@ dokku postgres:enter <service>

 A bash prompt can be opened against a running service. Filesystem changes will not be saved to disk.

+> NOTE: disconnecting from ssh while running this command may leave zombie processes due to moby/moby#9098
+
 ```shell
-dokku postgres:enter lolipop
+dokku postgres:enter lollipop
 ```

 You may also run a command directly against the service. Filesystem changes will not be saved to disk.

 ```shell
-dokku postgres:enter lolipop touch /tmp/test
+dokku postgres:enter lollipop touch /tmp/test
 ```

-### expose a postgres service on custom port if provided (random port otherwise)
+### expose a postgres service on custom host:port if provided (random port on the 0.0.0.0 interface if otherwise unspecified)

 ```shell
 # usage
@@ -286,7 +299,13 @@ dokku postgres:expose <service> <ports...>
 Expose the service on the service's normal ports, allowing access to it from the public interface (`0.0.0.0`):

 ```shell
-dokku postgres:expose lolipop 5432
+dokku postgres:expose lollipop 5432
+```
+
+Expose the service on the service's normal ports, with the first on a specified ip adddress (127.0.0.1):
+
+```shell
+dokku postgres:expose lollipop 127.0.0.1:5432
 ```

 ### unexpose a previously exposed postgres service
@@ -299,7 +318,7 @@ dokku postgres:unexpose <service>
 Unexpose the service, removing access to it from the public interface (`0.0.0.0`):

 ```shell
-dokku postgres:unexpose lolipop
+dokku postgres:unexpose lollipop
 ```

 ### promote service <service> as DATABASE_URL in <app>
@@ -328,7 +347,7 @@ This will replace `DATABASE_URL` with the url from other_service and generate an
 ```
 DATABASE_URL=postgres://other_service:ANOTHER_PASSWORD@dokku-postgres-other-service:5432/other_service
 DOKKU_DATABASE_BLUE_URL=postgres://other_service:ANOTHER_PASSWORD@dokku-postgres-other-service:5432/other_service
-DOKKU_DATABASE_SILVER_URL=postgres://lolipop:SOME_PASSWORD@dokku-postgres-lolipop:5432/lolipop
+DOKKU_DATABASE_SILVER_URL=postgres://lollipop:SOME_PASSWORD@dokku-postgres-lollipop:5432/lollipop
 ```

 ### start a previously stopped postgres service
@@ -341,7 +360,7 @@ dokku postgres:start <service>
 Start the service:

 ```shell
-dokku postgres:start lolipop
+dokku postgres:start lollipop
 ```

 ### stop a running postgres service
@@ -354,7 +373,7 @@ dokku postgres:stop <service>
 Stop the service and the running container:

 ```shell
-dokku postgres:stop lolipop
+dokku postgres:stop lollipop
 ```

 ### graceful shutdown and restart of the postgres service container
@@ -367,7 +386,7 @@ dokku postgres:restart <service>
 Restart the service:

 ```shell
-dokku postgres:restart lolipop
+dokku postgres:restart lollipop
 ```

 ### upgrade service <service> to the specified versions
@@ -379,15 +398,48 @@ dokku postgres:upgrade <service> [--upgrade-flags...]

 flags:

+- `-c|--config-options "--args --go=here"`: extra arguments to pass to the container create command (default: `None`)
 - `-C|--custom-env "USER=alpha;HOST=beta"`: semi-colon delimited environment variables to start the service with
 - `-i|--image IMAGE`: the image name to start the service with
 - `-I|--image-version IMAGE_VERSION`: the image version to start the service with
 - `-R|--restart-apps "true"`: whether to force an app restart
+- `-s|--shm-size SHM_SIZE`: override shared memory size for postgres docker container

 You can upgrade an existing service to a new image or image-version:

 ```shell
-dokku postgres:upgrade lolipop
+dokku postgres:upgrade lollipop
+```
+
+Postgres does not handle upgrading data for major versions automatically (eg. 11 => 12). Upgrades should be done manually. Users are encouraged to upgrade to the latest minor release for their postgres version before performing a major upgrade.
+
+While there are many ways to upgrade a postgres database, for safety purposes, it is recommended that an upgrade is performed by exporting the data from an existing database and importing it into a new database. This also allows testing to ensure that applications interact with the database correctly after the upgrade, and can be used in a staging environment.
+
+The following is an example of how to upgrade a postgres database named `lollipop-11` from 11.13 to 12.8.
+
+```shell
+# stop any linked apps
+dokku ps:stop linked-app
+
+# export the database contents
+dokku postgres:export lollipop-11 > /tmp/lollipop-11.export
+
+# create a new database at the desired version
+dokku postgres:create lollipop-12 --image-version 12.8
+
+# import the export file
+dokku postgres:import lollipop-12 < /tmp/lollipop-11.export
+
+# run any sql tests against the new database to verify the import went smoothly
+
+# unlink the old database from your apps
+dokku postgres:unlink lollipop-11 linked-app
+
+# link the new database to your apps
+dokku postgres:link lollipop-12 linked-app
+
+# start the linked apps again
+dokku ps:start linked-app
 ```

 ### Service Automation
@@ -401,7 +453,7 @@ Service scripting can be executed using the following commands:
 dokku postgres:app-links <app>
 ```

-List all postgres services that are linked to the 'playground' app. 
+List all postgres services that are linked to the `playground` app.

 ```shell
 dokku postgres:app-links playground
@@ -416,16 +468,19 @@ dokku postgres:clone <service> <new-service> [--clone-flags...]

 flags:

+- `-c|--config-options "--args --go=here"`: extra arguments to pass to the container create command (default: `None`)
 - `-C|--custom-env "USER=alpha;HOST=beta"`: semi-colon delimited environment variables to start the service with
 - `-i|--image IMAGE`: the image name to start the service with
 - `-I|--image-version IMAGE_VERSION`: the image version to start the service with
+- `-m|--memory MEMORY`: container memory limit (default: unlimited)
 - `-p|--password PASSWORD`: override the user-level service password
 - `-r|--root-password PASSWORD`: override the root-level service password
+- `-s|--shm-size SHM_SIZE`: override shared memory size for postgres docker container

 You can clone an existing service to a new one:

 ```shell
-dokku postgres:clone lolipop lolipop-2
+dokku postgres:clone lollipop lollipop-2
 ```

 ### check if the postgres service exists
@@ -435,10 +490,10 @@ dokku postgres:clone lolipop lolipop-2
 dokku postgres:exists <service>
 ```

-Here we check if the lolipop postgres service exists. 
+Here we check if the lollipop postgres service exists.

 ```shell
-dokku postgres:exists lolipop
+dokku postgres:exists lollipop
 ```

 ### check if the postgres service is linked to an app
@@ -448,10 +503,10 @@ dokku postgres:exists lolipop
 dokku postgres:linked <service> <app>
 ```

-Here we check if the lolipop postgres service is linked to the 'playground' app. 
+Here we check if the lollipop postgres service is linked to the `playground` app.

 ```shell
-dokku postgres:linked lolipop playground
+dokku postgres:linked lollipop playground
 ```

 ### list all apps linked to the postgres service
@@ -461,10 +516,10 @@ dokku postgres:linked lolipop playground
 dokku postgres:links <service>
 ```

-List all apps linked to the 'lolipop' postgres service. 
+List all apps linked to the `lollipop` postgres service.

 ```shell
-dokku postgres:links lolipop
+dokku postgres:links lollipop
 ```

 ### Data Management
@@ -481,7 +536,7 @@ dokku postgres:import <service>
 Import a datastore dump:

 ```shell
-dokku postgres:import lolipop < database.dump
+dokku postgres:import lollipop < data.dump
 ```

 ### export a dump of the postgres service database
@@ -494,13 +549,19 @@ dokku postgres:export <service>
 By default, datastore output is exported to stdout:

 ```shell
-dokku postgres:export lolipop
+dokku postgres:export lollipop
 ```

 You can redirect this output to a file:

 ```shell
-dokku postgres:export lolipop > lolipop.dump
+dokku postgres:export lollipop > data.dump
+```
+
+Note that the export will result in a file containing the binary postgres export data. It can be converted to plain text using `pg_restore` as follows
+
+```shell
+pg_restore data.dump -f plain.sql
 ```

 ### Backups
@@ -511,7 +572,7 @@ You may skip the `backup-auth` step if your dokku install is running within EC2

 Backups can be performed using the backup commands:

-### sets up authentication for backups on the postgres service
+### set up authentication for backups on the postgres service

 ```shell
 # usage
@@ -521,28 +582,28 @@ dokku postgres:backup-auth <service> <aws-access-key-id> <aws-secret-access-key>
 Setup s3 backup authentication:

 ```shell
-dokku postgres:backup-auth lolipop AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY
+dokku postgres:backup-auth lollipop AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY
 ```

 Setup s3 backup authentication with different region:

 ```shell
-dokku postgres:backup-auth lolipop AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_REGION
+dokku postgres:backup-auth lollipop AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_REGION
 ```

 Setup s3 backup authentication with different signature version and endpoint:

 ```shell
-dokku postgres:backup-auth lolipop AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_REGION AWS_SIGNATURE_VERSION ENDPOINT_URL
+dokku postgres:backup-auth lollipop AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_REGION AWS_SIGNATURE_VERSION ENDPOINT_URL
 ```

 More specific example for minio auth:

 ```shell
-dokku postgres:backup-auth lolipop MINIO_ACCESS_KEY_ID MINIO_SECRET_ACCESS_KEY us-east-1 s3v4 https://YOURMINIOSERVICE
+dokku postgres:backup-auth lollipop MINIO_ACCESS_KEY_ID MINIO_SECRET_ACCESS_KEY us-east-1 s3v4 https://YOURMINIOSERVICE
 ```

-### removes backup authentication for the postgres service
+### remove backup authentication for the postgres service

 ```shell
 # usage
@@ -552,10 +613,10 @@ dokku postgres:backup-deauth <service>
 Remove s3 authentication:

 ```shell
-dokku postgres:backup-deauth lolipop
+dokku postgres:backup-deauth lollipop
 ```

-### creates a backup of the postgres service to an existing s3 bucket
+### create a backup of the postgres service to an existing s3 bucket

 ```shell
 # usage
@@ -566,13 +627,19 @@ flags:

 - `-u|--use-iam`: use the IAM profile associated with the current server

-Backup the 'lolipop' service to the 'my-s3-bucket' bucket on ``AWS`:`
+Backup the `lollipop` service to the `my-s3-bucket` bucket on `AWS`:`

 ```shell
-dokku postgres:backup lolipop my-s3-bucket --use-iam
+dokku postgres:backup lollipop my-s3-bucket --use-iam
 ```

-### sets encryption for all future backups of postgres service
+Restore a backup file (assuming it was extracted via `tar -xf backup.tgz`):
+
+```shell
+dokku postgres:import lollipop < backup-folder/export
+```
+
+### set encryption for all future backups of postgres service

 ```shell
 # usage
@@ -582,10 +649,10 @@ dokku postgres:backup-set-encryption <service> <passphrase>
 Set the GPG-compatible passphrase for encrypting backups for backups:

 ```shell
-dokku postgres:backup-set-encryption lolipop
+dokku postgres:backup-set-encryption lollipop
 ```

-### unsets encryption for future backups of the postgres service
+### unset encryption for future backups of the postgres service

 ```shell
 # usage
@@ -595,10 +662,10 @@ dokku postgres:backup-unset-encryption <service>
 Unset the `GPG` encryption passphrase for backups:

 ```shell
-dokku postgres:backup-unset-encryption lolipop
+dokku postgres:backup-unset-encryption lollipop
 ```

-### schedules a backup of the postgres service
+### schedule a backup of the postgres service

 ```shell
 # usage
@@ -614,13 +681,13 @@ Schedule a backup:
 > 'schedule' is a crontab expression, eg. "0 3 * * *" for each day at 3am

 ```shell
-dokku postgres:backup-schedule lolipop "0 3 * * *" my-s3-bucket
+dokku postgres:backup-schedule lollipop "0 3 * * *" my-s3-bucket
 ```

 Schedule a backup and authenticate via iam:

 ```shell
-dokku postgres:backup-schedule lolipop "0 3 * * *" my-s3-bucket --use-iam
+dokku postgres:backup-schedule lollipop "0 3 * * *" my-s3-bucket --use-iam
 ```

 ### cat the contents of the configured backup cronfile for the service
@@ -633,10 +700,10 @@ dokku postgres:backup-schedule-cat <service>
 Cat the contents of the configured backup cronfile for the service:

 ```shell
-dokku postgres:backup-schedule-cat lolipop
+dokku postgres:backup-schedule-cat lollipop
 ```

-### unschedules the backup of the postgres service
+### unschedule the backup of the postgres service

 ```shell
 # usage
@@ -646,7 +713,7 @@ dokku postgres:backup-unschedule <service>
 Remove the scheduled backup from cron:

 ```shell
-dokku postgres:backup-unschedule lolipop
+dokku postgres:backup-unschedule lollipop
 ```

 ### Disabling `docker pull` calls
--- a/bin/generate
+++ b/bin/generate
@@ -5,7 +5,7 @@ import os
 import re


-def compile(service, version, variable, alias, image, scheme, ports, sponsors, unimplemented, dokku_version):
+def compile(service, version, variable, alias, image, scheme, ports, sponsors, options, unimplemented, dokku_version):
    prefix = "\n\n".join([
        header(service),
        description(service, image, version),
@@ -22,7 +22,7 @@ def compile(service, version, variable, alias, image, scheme, ports, sponsors, u
                requirements_section(dokku_version),
                installation_section(service, dokku_version),
                commands_section(service, variable, alias, image, scheme, ports, unimplemented),
-                usage_section(service, variable, alias, image, scheme, ports, unimplemented),
+                usage_section(service, variable, alias, image, scheme, ports, options, unimplemented),
            ]
        )
        .replace("\n\n\n\n\n", "\n")
@@ -115,31 +115,31 @@ def commands_section(service, variable, alias, image, scheme, ports, unimplement
    return "\n".join(content)


-def usage_section(service, variable, alias, image, scheme, ports, unimplemented):
+def usage_section(service, variable, alias, image, scheme, ports, options, unimplemented):
    return "\n\n".join(
        [
            "## Usage",
-            f"Help for any commands can be displayed by specifying the command as an argument to {service}:help. Please consult the `{service}:help` command for any undocumented commands.",
-            usage_intro(service, variable, alias, image, scheme, ports, unimplemented),
-            usage_lifecycle(service, variable, alias, image, scheme, ports, unimplemented),
-            usage_automation(service, variable, alias, image, scheme, ports, unimplemented),
-            usage_data_management(service, variable, alias, image, scheme, ports, unimplemented),
-            usage_backup(service, variable, alias, image, scheme, ports, unimplemented),
-            usage_docker_pull(service, variable, alias, image, scheme, ports, unimplemented),
+            f"Help for any commands can be displayed by specifying the command as an argument to {service}:help. Plugin help output in conjunction with any files in the `docs/` folder is used to generate the plugin documentation. Please consult the `{service}:help` command for any undocumented commands.",
+            usage_intro(service, variable, alias, image, scheme, ports, options, unimplemented),
+            usage_lifecycle(service, variable, alias, image, scheme, ports, options, unimplemented),
+            usage_automation(service, variable, alias, image, scheme, ports, options, unimplemented),
+            usage_data_management(service, variable, alias, image, scheme, ports, options, unimplemented),
+            usage_backup(service, variable, alias, image, scheme, ports, options, unimplemented),
+            usage_docker_pull(service, variable, alias, image, scheme, ports, options, unimplemented),
        ]
    )


-def usage_intro(service, variable, alias, image, scheme, ports, unimplemented):
+def usage_intro(service, variable, alias, image, scheme, ports, options, unimplemented):
    commands = ["create", "info", "list", "logs", "link", "unlink"]
    content = ["### Basic Usage"]

    return fetch_commands_content(
-        service, variable, alias, image, scheme, ports, unimplemented, commands, content
+        service, variable, alias, image, scheme, ports, options, unimplemented, commands, content
    )


-def usage_lifecycle(service, variable, alias, image, scheme, ports, unimplemented):
+def usage_lifecycle(service, variable, alias, image, scheme, ports, options, unimplemented):
    commands = [
        "connect",
        "enter",
@@ -159,11 +159,11 @@ def usage_lifecycle(service, variable, alias, image, scheme, ports, unimplemente
    ]

    return fetch_commands_content(
-        service, variable, alias, image, scheme, ports, unimplemented, commands, content
+        service, variable, alias, image, scheme, ports, options, unimplemented, commands, content
    )


-def usage_automation(service, variable, alias, image, scheme, ports, unimplemented):
+def usage_automation(service, variable, alias, image, scheme, ports, options, unimplemented):
    commands = ["app-links", "clone", "exists", "linked", "links"]
    content = [
        "### Service Automation",
@@ -173,11 +173,11 @@ def usage_automation(service, variable, alias, image, scheme, ports, unimplement
    ]

    return fetch_commands_content(
-        service, variable, alias, image, scheme, ports, unimplemented, commands, content
+        service, variable, alias, image, scheme, ports, options, unimplemented, commands, content
    )


-def usage_data_management(service, variable, alias, image, scheme, ports, unimplemented):
+def usage_data_management(service, variable, alias, image, scheme, ports, options, unimplemented):
    commands = ["import", "export"]
    content = [
        "### Data Management",
@@ -187,11 +187,11 @@ def usage_data_management(service, variable, alias, image, scheme, ports, unimpl
    ]

    return fetch_commands_content(
-        service, variable, alias, image, scheme, ports, unimplemented, commands, content
+        service, variable, alias, image, scheme, ports, options, unimplemented, commands, content
    )


-def usage_backup(service, variable, alias, image, scheme, ports, unimplemented):
+def usage_backup(service, variable, alias, image, scheme, ports, options, unimplemented):
    commands = [
        "backup-auth",
        "backup-deauth",
@@ -214,11 +214,11 @@ def usage_backup(service, variable, alias, image, scheme, ports, unimplemented):
    ]

    return fetch_commands_content(
-        service, variable, alias, image, scheme, ports, unimplemented, commands, content
+        service, variable, alias, image, scheme, ports, options, unimplemented, commands, content
    )


-def usage_docker_pull(service, variable, alias, image, scheme, ports, unimplemented):
+def usage_docker_pull(service, variable, alias, image, scheme, ports, options, unimplemented):
    service_prefix = service.upper()
    return "\n".join(
        [
@@ -232,11 +232,11 @@ def usage_docker_pull(service, variable, alias, image, scheme, ports, unimplemen


 def fetch_commands_content(
-    service, variable, alias, image, scheme, ports, unimplemented, commands, content
+    service, variable, alias, image, scheme, ports, options, unimplemented, commands, content
 ):
    i = 0
    for command in commands:
-        output = command_help(command, service, variable, alias, image, scheme, ports, unimplemented)
+        output = command_help(command, service, variable, alias, image, scheme, ports, options, unimplemented)
        if output == "":
            continue
        content.append(output)
@@ -274,7 +274,7 @@ def parse_args(line):
    return " ".join(arguments)


-def command_help(command, service, variable, alias, image, scheme, ports, unimplemented):
+def command_help(command, service, variable, alias, image, scheme, ports, options, unimplemented):
    if command in unimplemented:
        return ""

@@ -300,12 +300,20 @@ def command_help(command, service, variable, alias, image, scheme, ports, unimpl
        content.append("flags:")
        content.append("")
    for flag in data["flags"]:
+        if "--config-options" in flag and options != "":
+            flag = f"{flag} (default: `{options}`)"
        content.append(f"- {flag}")

    if len(data["examples"]) > 0:
        content.append("")
        content.append(data["examples"])

+    doc_file = os.path.join("docs", f"{command}.md")
+    if os.path.isfile(doc_file):
+        content.append("")
+        with open(doc_file) as f:
+            content.append(f.read())
+
    return "\n" + "\n".join(content)


@@ -445,6 +453,10 @@ def process_sentence(sentence_lines):

    # some cleanup
    text = text.replace("(0.0.0.0)", "(`0.0.0.0`)")
+    text = text.replace("'", "`")
+    text = text.replace("`s", "'s")
+    text = text.replace("``", "`")
+    text = text.strip(" ")

    return text

@@ -473,6 +485,7 @@ def main():
    variable = None
    image = None
    alias = None
+    options = None
    unimplemented = []

    with open("Dockerfile") as f:
@@ -499,6 +512,13 @@ def main():
                if match is not None:
                    unimplemented = [s.strip('"') for s in match.group(1).split(" ")]

+    with open("config") as f:
+        for line in f.readlines():
+            if f"{variable}_CONFIG_OPTIONS" in line:
+                match = re.search('"(.+)"', line)
+                if match is not None:
+                    options = match.group(1)
+
    sponsors = []
    with open("plugin.toml") as f:
        for line in f.readlines():
@@ -506,7 +526,7 @@ def main():
                sponsors = re.search("\[([\"\w\s,_-]+)\]", line).group(1)
                sponsors = [s.strip("\"") for s in sponsors.split(",")]

-    text = compile(service, version, variable, alias, image, scheme, ports, sponsors, unimplemented, "0.19.x+")
+    text = compile(service, version, variable, alias, image, scheme, ports, sponsors, options, unimplemented, "0.19.x+")

    base_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
    readme_file = os.path.join(base_path, "README.md")
--- a/170
+++ b/170
@@ -4,8 +4,20 @@ set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_AVAILABLE_PATH/config/functions"

+add_to_links_file() {
+  declare desc="add an app to the service link file"
+  declare SERVICE="$1" APP="$2"
+  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
+  local LINKS_FILE="$SERVICE_ROOT/LINKS"
+
+  touch "$LINKS_FILE"
+  sed -i.bak "/^$APP\$/d" "$LINKS_FILE" && rm "$LINKS_FILE.bak"
+  echo "$APP" >>"$LINKS_FILE"
+  sort "$LINKS_FILE" -u -o "$LINKS_FILE"
+}
+
 docker_ports_options() {
-  declare desc="Exports a list of exposed ports"
+  declare desc="export a list of exposed ports"
  declare PORTS=("$@")
  for ((i = 0; i < ${#PLUGIN_DATASTORE_PORTS[@]}; i++)); do
    echo -n "-p ${PORTS[i]}:${PLUGIN_DATASTORE_PORTS[i]} "
@@ -13,13 +25,13 @@ docker_ports_options() {
 }

 get_container_ip() {
-  declare desc="Retrieves the ip address of a container"
+  declare desc="retrieve the ip address of a container"
  declare CONTAINER_ID="$1"
  docker inspect --format '{{ .NetworkSettings.IPAddress }}' "$CONTAINER_ID" 2>/dev/null
 }

 get_database_name() {
-  declare desc="Retrieves a sanitized database name"
+  declare desc="retrieve a sanitized database name"
  declare SERVICE="$1"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"

@@ -31,7 +43,7 @@ get_database_name() {
 }

 get_random_ports() {
-  declare desc="Retrieves N random ports"
+  declare desc="retrieve N random ports"
  declare iterations="${1:-1}"
  for ((i = 0; i < iterations; i++)); do
    local port=$RANDOM
@@ -50,19 +62,28 @@ get_random_ports() {
 }

 get_service_name() {
-  declare desc="Retrieves a docker service label"
+  declare desc="retrieve a docker service label"
  declare SERVICE="$1"
  echo "dokku.${PLUGIN_COMMAND_PREFIX}.$SERVICE"
 }

 get_url_from_config() {
-  declare desc="Retrieves a given _URL from a list of configuration variables"
+  declare desc="retrieve a given _URL from a list of configuration variables"
  declare EXISTING_CONFIG="$1" CONFIG_VAR="$2"
  echo "$EXISTING_CONFIG" | grep "$CONFIG_VAR" | sed "s/$CONFIG_VAR:\s*//" | xargs
 }

+in_links_file() {
+  declare desc="check if a service LINKS file contains an app"
+  declare SERVICE="$1" APP="$2"
+  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
+  local LINKS_FILE="$SERVICE_ROOT/LINKS"
+
+  grep -qE "^$APP\$" "$LINKS_FILE"
+}
+
 is_container_status() {
-  declare desc="Returns 0 or 1 depending upon whether a given container has a certain status"
+  declare desc="return 0 or 1 depending upon whether a given container has a certain status"
  declare CID="$1" STATUS="$2"
  local TEMPLATE="{{.State.$STATUS}}"
  local CONTAINER_STATUS=$(docker inspect -f "$TEMPLATE" "$CID" 2>/dev/null || true)
@@ -90,7 +111,7 @@ is_implemented_command() {
 }

 is_valid_service_name() {
-  declare desc="Validates a service name"
+  declare desc="validate a service name"
  declare SERVICE="$1"
  [[ -z "$SERVICE" ]] && return 1

@@ -102,7 +123,7 @@ is_valid_service_name() {
 }

 remove_from_links_file() {
-  declare desc="Removes an app from the service link file"
+  declare desc="remove an app from the service link file"
  declare SERVICE="$1" APP="$2"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local LINKS_FILE="$SERVICE_ROOT/LINKS"
@@ -137,7 +158,7 @@ retry-docker-command() {
 }

 service_alternative_alias() {
-  declare desc="Retrieves an alternative alias for a service"
+  declare desc="retrieve an alternative alias for a service"
  declare EXISTING_CONFIG="$1"
  local COLORS=(AQUA BLACK BLUE FUCHSIA GRAY GREEN LIME MAROON NAVY OLIVE PURPLE RED SILVER TEAL WHITE YELLOW)
  local ALIAS
@@ -154,7 +175,7 @@ service_alternative_alias() {
 }

 service_app_links() {
-  declare desc="Outputs all service links for a given app"
+  declare desc="output all service links for a given app"
  declare APP="$1"
  local SERVICE LINKED_APP

@@ -170,7 +191,7 @@ service_app_links() {
 }

 service_backup() {
-  declare desc="Creates a backup of a service to an existing s3 bucket"
+  declare desc="create a backup of a service to an existing s3 bucket"
  declare SERVICE="$1" BUCKET_NAME="$2" USE_IAM_OPTIONAL_FLAG="$3"
  local SERVICE_BACKUP_ROOT="$PLUGIN_DATA_ROOT/$SERVICE/backup"
  local BACKUP_ENCRYPTION_CONFIG_ROOT="$PLUGIN_DATA_ROOT/$SERVICE/backup-encryption"
@@ -221,8 +242,48 @@ service_backup() {
  docker run --rm $BACKUP_PARAMETERS "$PLUGIN_S3BACKUP_IMAGE"
 }

+service_commit_config() {
+  declare SERVICE="$1"
+  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
+  local CONFIG_VARIABLE="${PLUGIN_VARIABLE}_CONFIG_OPTIONS"
+  local ENV_VARIABLE="${PLUGIN_VARIABLE}_CUSTOM_ENV"
+
+
+  custom_env="${!ENV_VARIABLE}"
+  [[ -n "$SERVICE_CUSTOM_ENV" ]] && custom_env="$SERVICE_CUSTOM_ENV"
+  if [[ -n $custom_env ]]; then
+    echo "$custom_env" | tr ';' "\n" >"$SERVICE_ROOT/ENV"
+  else
+    echo "" >"$SERVICE_ROOT/ENV"
+  fi
+
+  config_options="${!CONFIG_VARIABLE}"
+  [[ -n "$PLUGIN_CONFIG_OPTIONS" ]] && config_options="$PLUGIN_CONFIG_OPTIONS"
+  if [[ -n "$config_options" ]]; then
+    echo "$config_options" >"$SERVICE_ROOT/CONFIG_OPTIONS"
+  else
+    echo "" >"$SERVICE_ROOT/CONFIG_OPTIONS"
+  fi
+
+  if [[ -n "$SERVICE_MEMORY" ]]; then
+    echo "$SERVICE_MEMORY" >"$SERVICE_ROOT/SERVICE_MEMORY"
+  fi
+
+  if [[ -n "$SERVICE_SHM_SIZE" ]]; then
+    echo "$SERVICE_SHM_SIZE" >"$SERVICE_ROOT/SHM_SIZE"
+  fi
+
+  if [[ -n "$PLUGIN_IMAGE" ]]; then
+    echo "$PLUGIN_IMAGE" >"$SERVICE_ROOT/IMAGE"
+  fi
+
+  if [[ -n "$PLUGIN_IMAGE_VERSION" ]]; then
+    echo "$PLUGIN_IMAGE_VERSION" >"$SERVICE_ROOT/IMAGE_VERSION"
+  fi
+}
+
 service_backup_auth() {
-  declare desc="Sets up authentication"
+  declare desc="set up authentication"
  declare SERVICE="$1" AWS_ACCESS_KEY_ID="$2" AWS_SECRET_ACCESS_KEY="$3" AWS_DEFAULT_REGION="$4" AWS_SIGNATURE_VERSION="$5" ENDPOINT_URL="$6"
  local SERVICE_BACKUP_ROOT="$PLUGIN_DATA_ROOT/$SERVICE/backup"

@@ -244,7 +305,7 @@ service_backup_auth() {
 }

 service_backup_deauth() {
-  declare desc="Removes authentication"
+  declare desc="remove authentication"
  declare SERVICE="$1"
  local SERVICE_ROOT="${PLUGIN_DATA_ROOT}/${SERVICE}"
  local SERVICE_BACKUP_ROOT="${SERVICE_ROOT}/backup/"
@@ -282,7 +343,7 @@ service_backup_schedule_cat() {
 }

 service_backup_set_encryption() {
-  declare desc="Sets up backup encryption"
+  declare desc="set up backup encryption"
  declare SERVICE="$1" ENCRYPTION_KEY="$2"
  local SERVICE_ROOT="${PLUGIN_DATA_ROOT}/${SERVICE}"
  local SERVICE_BACKUP_ENCRYPTION_ROOT="${SERVICE_ROOT}/backup-encryption/"
@@ -292,7 +353,7 @@ service_backup_set_encryption() {
 }

 service_backup_unschedule() {
-  declare desc="unschedules the backup of the service"
+  declare desc="unschedule the backup of the service"
  declare SERVICE="$1"
  local CRON_FILE="/etc/cron.d/dokku-${PLUGIN_COMMAND_PREFIX}-${SERVICE}"

@@ -300,7 +361,7 @@ service_backup_unschedule() {
 }

 service_backup_unset_encryption() {
-  declare desc="Removes backup encryption"
+  declare desc="remove backup encryption"
  declare SERVICE="$1"
  local SERVICE_ROOT="${PLUGIN_DATA_ROOT}/${SERVICE}"
  local SERVICE_BACKUP_ENCRYPTION_ROOT="${SERVICE_ROOT}/backup-encryption/"
@@ -309,7 +370,7 @@ service_backup_unset_encryption() {
 }

 service_container_rm() {
-  declare desc="Stops a service and removes the running container"
+  declare desc="stop a service and remove the running container"
  declare SERVICE="$1"
  local SERVICE_NAME="$(get_service_name "$SERVICE")"
  local ID
@@ -329,14 +390,14 @@ service_container_rm() {
 }

 service_dns_hostname() {
-  declare desc="Retrieves the alias of a service"
+  declare desc="retrieve the alias of a service"
  declare SERVICE="$1"
  local SERVICE_NAME="$(get_service_name "$SERVICE")"
  echo "$SERVICE_NAME" | tr ._ -
 }

 service_enter() {
-  declare desc="enters running app container of specified proc type"
+  declare desc="enter running app container of specified proc type"
  declare SERVICE="$1" && shift 1
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local ID="$(cat "$SERVICE_ROOT/ID")"
@@ -351,7 +412,7 @@ service_enter() {
 }

 service_exposed_ports() {
-  declare desc="Lists exposed ports for a service"
+  declare desc="list exposed ports for a service"
  declare SERVICE="$1"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local PORT_FILE="$SERVICE_ROOT/PORT"
@@ -363,8 +424,14 @@ service_exposed_ports() {
 }

 service_image_exists() {
-  declare desc="Checks if the current image exists"
-  local IMAGE="$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION"
+  declare desc="check if the current image exists"
+  declare SERVICE="$1"
+  local plugin_image="$PLUGIN_IMAGE"
+  local plugin_image_version="$PLUGIN_IMAGE_VERSION"
+
+  [[ -f "$SERVICE_ROOT/IMAGE" ]] && plugin_image="$(cat "$SERVICE_ROOT/IMAGE")"
+  [[ -f "$SERVICE_ROOT/IMAGE_VERSION" ]] && plugin_image_version="$(cat "$SERVICE_ROOT/IMAGE_VERSION")"
+  local IMAGE="$plugin_image:$plugin_image_version"

  if [[ "$(docker images -q "$IMAGE" 2>/dev/null)" == "" ]]; then
    return 1
@@ -374,7 +441,7 @@ service_image_exists() {
 }

 service_info() {
-  declare desc="Retrieves information about a given service"
+  declare desc="retrieve information about a given service"
  declare SERVICE="$1" INFO_FLAG="$2"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local SERVICE_URL=$(service_url "$SERVICE")
@@ -384,6 +451,7 @@ service_info() {

  local flag_map=(
    "--config-dir: ${SERVICE_ROOT}/${PLUGIN_CONFIG_SUFFIX}"
+    "--config-options: $(cat "$SERVICE_ROOT/CONFIG_OPTIONS")"
    "--data-dir: ${SERVICE_ROOT}/data"
    "--dsn: ${SERVICE_URL}"
    "--exposed-ports: $(service_exposed_ports "$SERVICE")"
@@ -413,7 +481,7 @@ service_info() {
 }

 service_is_linked() {
-  declare desc="Links a service to an application"
+  declare desc="link a service to an application"
  declare SERVICE="$1" APP="$2"
  update_plugin_scheme_for_app "$APP"
  local SERVICE_URL=$(service_url "$SERVICE")
@@ -427,7 +495,7 @@ service_is_linked() {
 }

 service_link() {
-  declare desc="Links a service to an application"
+  declare desc="link a service to an application"
  declare SERVICE="$1" APP="$2"
  update_plugin_scheme_for_app "$APP"
  local SERVICE_URL=$(service_url "$SERVICE")
@@ -454,9 +522,7 @@ service_link() {

  [[ -n $LINK ]] && dokku_log_fail "Already linked as $LINK"
  plugn trigger service-action pre-link "$SERVICE" "$APP"
-  touch "$LINKS_FILE"
-  echo "$APP" >>"$LINKS_FILE"
-  sort "$LINKS_FILE" -u -o "$LINKS_FILE"
+  add_to_links_file "$SERVICE" "$APP"

  if declare -f -F add_passed_docker_option >/dev/null; then
    # shellcheck disable=SC2034
@@ -472,7 +538,7 @@ service_link() {
 }

 service_linked_apps() {
-  declare desc="Lists all apps linked to a service for info output"
+  declare desc="list all apps linked to a service for info output"
  declare SERVICE="$1"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local LINKS_FILE="$SERVICE_ROOT/LINKS"
@@ -484,7 +550,7 @@ service_linked_apps() {
 }

 service_links() {
-  declare desc="Lists all apps linked to a service"
+  declare desc="list all apps linked to a service"
  declare SERVICE="$1"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local LINKS_FILE="$SERVICE_ROOT/LINKS"
@@ -496,7 +562,7 @@ service_links() {
 }

 service_list() {
-  declare desc="Lists all services and their status"
+  declare desc="list all services and their status"
  local SERVICES=$(ls "$PLUGIN_DATA_ROOT" 2>/dev/null)

  if [[ -z $SERVICES ]]; then
@@ -511,7 +577,7 @@ service_list() {
 }

 service_logs() {
-  declare desc="Displays logs for a service"
+  declare desc="display logs for a service"
  declare SERVICE="$1" TAIL_FLAG="$2"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local ID=$(cat "$SERVICE_ROOT/ID")
@@ -549,13 +615,14 @@ service_parse_args() {
      "--querystring") set -- "$@" "-q" ;;
      "--restart-apps") set -- "$@" "-R" ;;
      "--root-password") set -- "$@" "-r" ;;
+      "--shm-size") set -- "$@" "-s" ;;
      "--user") set -- "$@" "-u" ;;
      *) set -- "$@" "$arg" ;;
    esac
  done

  OPTIND=1
-  while getopts "a:c:C:d:i:I:m:p:q:R:r:u:" opt; do
+  while getopts "a:c:C:d:i:I:m:p:q:R:r:s:u:" opt; do
    case "$opt" in
      a)
        SERVICE_ALIAS="${OPTARG^^}"
@@ -591,6 +658,9 @@ service_parse_args() {
      r)
        export SERVICE_ROOT_PASSWORD=$OPTARG
        ;;
+      s)
+        export SERVICE_SHM_SIZE=$OPTARG
+        ;;
      u)
        export SERVICE_USER=$OPTARG
        ;;
@@ -600,7 +670,7 @@ service_parse_args() {
 }

 service_password() {
-  declare desc="Fetch the password for a service"
+  declare desc="fetch the password for a service"
  declare SERVICE="$1"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local PASSWORD_FILE="$SERVICE_ROOT/PASSWORD"
@@ -610,7 +680,7 @@ service_password() {
 }

 service_root_password() {
-  declare desc="Fetch the root password for a service"
+  declare desc="fetch the root password for a service"
  declare SERVICE="$1"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local PASSWORD_FILE="$SERVICE_ROOT/ROOTPASSWORD"
@@ -620,14 +690,14 @@ service_root_password() {
 }

 service_port_expose() {
-  declare desc="Wrapper for exposing service ports"
+  declare desc="wrapper for exposing service ports"
  declare SERVICE="$1"
  service_start "$SERVICE" "true"
  service_port_unpause "$SERVICE" "true" "${@:2}"
 }

 service_port_pause() {
-  declare desc="Pauses service exposure"
+  declare desc="pause service exposure"
  declare SERVICE="$1" LOG_FAIL="$2"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local EXPOSED_NAME="$(get_service_name "$SERVICE").ambassador"
@@ -657,7 +727,7 @@ service_port_pause() {
 }

 service_port_unexpose() {
-  declare desc="Wrapper for pausing exposed service ports"
+  declare desc="wrapper for pausing exposed service ports"
  declare SERVICE="$1"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local PORT_FILE="$SERVICE_ROOT/PORT"
@@ -666,7 +736,7 @@ service_port_unexpose() {
 }

 service_port_unpause() {
-  declare desc="Starts service exposure"
+  declare desc="start service exposure"
  declare SERVICE="$1" LOG_FAIL="$2"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local SERVICE_NAME="$(get_service_name "$SERVICE")"
@@ -697,7 +767,7 @@ service_port_unpause() {
 }

 service_promote() {
-  declare desc="Promotes a secondary service to the primary env var"
+  declare desc="promote a secondary service to the primary env var"
  declare SERVICE="$1" APP="$2"
  local PLUGIN_DEFAULT_CONFIG_VAR="${PLUGIN_DEFAULT_ALIAS}_URL"
  local EXISTING_CONFIG=$(config_all "$APP")
@@ -725,7 +795,7 @@ service_promote() {
 }

 service_set_alias() {
-  declare desc="Sets the alias in use for a service"
+  declare desc="sets the alias in use for a service"
  declare SERVICE="$1" ALIAS="$2"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local ALIAS_FILE="$SERVICE_ROOT/ALIAS"
@@ -735,7 +805,7 @@ service_set_alias() {
 }

 service_status() {
-  declare desc="Displays the status of a service"
+  declare desc="display the status of a service"
  declare SERVICE="$1"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local ID="$(cat "$SERVICE_ROOT/ID")"
@@ -747,7 +817,7 @@ service_status() {
 }

 service_stop() {
-  declare desc="Stops a running service"
+  declare desc="stop a running service"
  declare SERVICE="$1"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
  local SERVICE_NAME="$(get_service_name "$SERVICE")"
@@ -765,7 +835,7 @@ service_stop() {
 }

 service_unlink() {
-  declare desc="Unlinks an application from a service"
+  declare desc="unlink an application from a service"
  declare SERVICE="$1" APP="$2"
  update_plugin_scheme_for_app "$APP"
  local SERVICE_URL=$(service_url "$SERVICE")
@@ -787,19 +857,19 @@ service_unlink() {

  [[ -z ${LINK[*]} ]] && dokku_log_fail "Not linked to app $APP"
  plugn trigger service-action post-unlink "$SERVICE" "$APP"
-  config_unset "$APP" "${LINK[*]}"
+  config_unset "$APP" "${LINK[@]}"
  plugn trigger service-action post-unlink-complete "$SERVICE" "$APP"
 }

 service_version() {
-  declare desc="Displays the running version for an image"
+  declare desc="display the running version for an image"
  declare SERVICE="$1"
  local SERVICE_NAME="$(get_service_name "$SERVICE")"
  docker inspect -f '{{.Config.Image}}' "$SERVICE_NAME" 2>/dev/null || true
 }

 update_plugin_scheme_for_app() {
-  declare desc="Retrieves the updated plugin scheme"
+  declare desc="retrieve the updated plugin scheme"
  declare APP="$1"
  local DATABASE_SCHEME

@@ -808,7 +878,7 @@ update_plugin_scheme_for_app() {
 }

 verify_service_name() {
-  declare desc="Verifies that a service exists"
+  declare desc="verify that a service exists"
  declare SERVICE="$1"
  [[ -z "$SERVICE" ]] && dokku_log_fail "(verify_service_name) SERVICE must not be null"
  [[ ! -d "$PLUGIN_DATA_ROOT/$SERVICE" ]] && dokku_log_fail "$PLUGIN_SERVICE service $SERVICE does not exist"
@@ -816,7 +886,7 @@ verify_service_name() {
 }

 write_database_name() {
-  declare desc="Writes a sanitized database name"
+  declare desc="write a sanitized database name"
  declare SERVICE="$1"
  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"

--- a/2
+++ b/2
@@ -31,3 +31,5 @@ export PLUGIN_BUSYBOX_IMAGE="busybox:1.31.1-uclibc"
 export PLUGIN_AMBASSADOR_IMAGE="dokku/ambassador:0.3.3"
 export PLUGIN_S3BACKUP_IMAGE="dokku/s3backup:0.10.3"
 export PLUGIN_WAIT_IMAGE="dokku/wait:0.4.3"
+
+export POSTGRES_CONFIG_OPTIONS=${POSTGRES_CONFIG_OPTIONS:=""}
--- a/docs/README.md
+++ b/docs/README.md
@@ -0,0 +1,4 @@
+# Extra Documentation
+
+The documentation in this folder is supplemental to using this plugin. It is injected automatically into the plugin's readme during documentation generation.
+
--- a/docs/create.md
+++ b/docs/create.md
@@ -0,0 +1,5 @@
+Official Postgres docker images does not include postgis extension (amongst others). The following example creates a new postgres service using `postgis/postgis:13-3.1` image, which includes the `postgis` extension.
+
+```shell
+dokku postgres:create postgis-database --image "postgis/postgis" --image-version "13-3.1"
+```
--- a/docs/export.md
+++ b/docs/export.md
@@ -0,0 +1,5 @@
+Note that the export will result in a file containing the binary postgres export data. It can be converted to plain text using `pg_restore` as follows
+
+```shell
+pg_restore data.dump -f plain.sql
+```
--- a/docs/upgrade.md
+++ b/docs/upgrade.md
@@ -0,0 +1,30 @@
+Postgres does not handle upgrading data for major versions automatically (eg. 11 => 12). Upgrades should be done manually. Users are encouraged to upgrade to the latest minor release for their postgres version before performing a major upgrade.
+
+While there are many ways to upgrade a postgres database, for safety purposes, it is recommended that an upgrade is performed by exporting the data from an existing database and importing it into a new database. This also allows testing to ensure that applications interact with the database correctly after the upgrade, and can be used in a staging environment.
+
+The following is an example of how to upgrade a postgres database named `lollipop-11` from 11.13 to 12.8.
+
+```shell
+# stop any linked apps
+dokku ps:stop linked-app
+
+# export the database contents
+dokku postgres:export lollipop-11 > /tmp/lollipop-11.export
+
+# create a new database at the desired version
+dokku postgres:create lollipop-12 --image-version 12.8
+
+# import the export file
+dokku postgres:import lollipop-12 < /tmp/lollipop-11.export
+
+# run any sql tests against the new database to verify the import went smoothly
+
+# unlink the old database from your apps
+dokku postgres:unlink lollipop-11 linked-app
+
+# link the new database to your apps
+dokku postgres:link lollipop-12 linked-app
+
+# start the linked apps again
+dokku ps:start linked-app
+```
--- a/32
+++ b/32
@@ -17,7 +17,7 @@ service_connect() {
  local SERVICE_TTY_OPTS
  has_tty && SERVICE_TTY_OPTS="-t"

-  docker exec -i $SERVICE_TTY_OPTS "$SERVICE_NAME" psql -h localhost -U postgres "$DATABASE_NAME"
+  docker exec --env=LANG=C.UTF-8 --env=LC_ALL=C.UTF-8 -i $SERVICE_TTY_OPTS "$SERVICE_NAME" psql -h localhost -U postgres "$DATABASE_NAME"
 }

 service_create() {
@@ -53,13 +53,7 @@ service_create() {
  echo "$PASSWORD" >"$SERVICE_ROOT/PASSWORD"
  chmod 640 "$SERVICE_ROOT/PASSWORD"

-  [[ -n "$SERVICE_CUSTOM_ENV" ]] && POSTGRES_CUSTOM_ENV="$SERVICE_CUSTOM_ENV"
-  if [[ -n $POSTGRES_CUSTOM_ENV ]]; then
-    echo "$POSTGRES_CUSTOM_ENV" | tr ';' "\n" >"$SERVICE_ROOT/ENV"
-  else
-    echo "" >"$SERVICE_ROOT/ENV"
-  fi
-
+  service_commit_config "$SERVICE"
  write_database_name "$SERVICE"
  plugn trigger service-action post-create "$SERVICE"
  service_create_container "$SERVICE"
@@ -75,7 +69,25 @@ service_create_container() {
  local DATABASE_NAME="$(get_database_name "$SERVICE")"
  local PREVIOUS_ID

-  ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_HOST_ROOT/data:/var/lib/postgresql/data" -e "POSTGRES_PASSWORD=$PASSWORD" --env-file="$SERVICE_ROOT/ENV" -d --restart always --label dokku=service --label dokku.service=postgres "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION")
+  if [[ -f "$SERVICE_ROOT/CONFIG_OPTIONS" ]]; then
+    export CONFIG_OPTIONS="$(cat "$SERVICE_ROOT/CONFIG_OPTIONS")"
+  fi
+
+  [[ -f "$SERVICE_ROOT/SERVICE_MEMORY" ]] && SERVICE_MEMORY="$(cat "$SERVICE_ROOT/SERVICE_MEMORY")"
+  if [[ -n "$SERVICE_MEMORY" ]]; then
+    MEMORY_LIMIT="--memory=${SERVICE_MEMORY}m"
+  fi
+
+  [[ -f "$SERVICE_ROOT/SHM_SIZE" ]] && SERVICE_SHM_SIZE="$(cat "$SERVICE_ROOT/SHM_SIZE")"
+  if [[ -n "$SERVICE_SHM_SIZE" ]]; then
+    SHM_SIZE="--shm-size=${SERVICE_SHM_SIZE}"
+  fi
+
+  [[ -f "$SERVICE_ROOT/IMAGE" ]] && PLUGIN_IMAGE="$(cat "$SERVICE_ROOT/IMAGE")"
+  [[ -f "$SERVICE_ROOT/IMAGE_VERSION" ]] && PLUGIN_IMAGE_VERSION="$(cat "$SERVICE_ROOT/IMAGE_VERSION")"
+
+  # shellcheck disable=SC2086
+  ID=$(docker run --name "$SERVICE_NAME" $MEMORY_LIMIT $SHM_SIZE -v "$SERVICE_HOST_ROOT/data:/var/lib/postgresql/data" -e "POSTGRES_PASSWORD=$PASSWORD" --env-file="$SERVICE_ROOT/ENV" -d --restart always --label dokku=service --label dokku.service=postgres "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" $CONFIG_OPTIONS)
  echo "$ID" >"$SERVICE_ROOT/ID"

  dokku_log_verbose_quiet "Waiting for container to be ready"
@@ -151,6 +163,8 @@ service_start() {
    service_create_container "$SERVICE"
  else
    if ! service_image_exists "$SERVICE"; then
+      [[ -f "$SERVICE_ROOT/IMAGE" ]] && PLUGIN_IMAGE="$(cat "$SERVICE_ROOT/IMAGE")"
+      [[ -f "$SERVICE_ROOT/IMAGE_VERSION" ]] && PLUGIN_IMAGE_VERSION="$(cat "$SERVICE_ROOT/IMAGE_VERSION")"
      dokku_log_verbose_quiet "Missing image $PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION for $SERVICE"
    else
      dokku_log_verbose_quiet "Neither container nor valid configuration exists for $SERVICE"
--- a/6
+++ b/6
@@ -141,7 +141,7 @@ fn-help-contents-subcommand() {
 }

 fn-help-fancy-tput() {
-  declare desc="A wrapper around tput"
+  declare desc="a wrapper around tput"

  if [[ -n "$DOKKU_NO_COLOR" ]] || [[ "$TERM" == "unknown" ]] || [[ "$TERM" == "dumb" ]]; then
    return
@@ -151,7 +151,7 @@ fn-help-fancy-tput() {
 }

 fn-help-fancy-color() {
-  declare desc="A wrapper around colors"
+  declare desc="a wrapper around colors"

  if [[ -n "$DOKKU_NO_COLOR" ]] || [[ "$TERM" == "unknown" ]] || [[ "$TERM" == "dumb" ]]; then
    return
@@ -309,7 +309,7 @@ fn-help-subcommand-sanitize() {
 }

 _fn-help-apply-shell-expansion() {
-  declare desc="Expand environment variables for a shell command"
+  declare desc="expand environment variables for a shell command"
  declare data="$1"
  declare delimiter="__apply_shell_expansion_delimiter__"
  declare command="cat <<$delimiter"$'\n'"$data"$'\n'"$delimiter"
--- a/18
+++ b/18
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config"
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common-functions"
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x

@@ -42,6 +43,23 @@ plugin-install() {
 EOL

  chmod 0440 "$_SUDOERS_FILE"
+
+  local SERVICES=$(ls "$PLUGIN_DATA_ROOT" 2>/dev/null)
+  for SERVICE in $SERVICES; do
+    local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
+
+    if [[ ! -f "$SERVICE_ROOT/IMAGE" ]] || [[ ! -f "$SERVICE_ROOT/IMAGE_VERSION" ]]; then
+      local image="$(service_version "$SERVICE")"
+      if [[ "$image" == *":"* ]]; then
+        echo "${image%:*}" > "$SERVICE_ROOT/IMAGE"
+        echo "${image##*:}" > "$SERVICE_ROOT/IMAGE_VERSION"
+      fi
+    fi
+
+    if [[ -f "$SERVICE_ROOT/${PLUGIN_VARIABLE}_CONFIG_OPTIONS" ]]; then
+      mv "$SERVICE_ROOT/${PLUGIN_VARIABLE}_CONFIG_OPTIONS" "$SERVICE_ROOT/CONFIG_OPTIONS"
+    fi
+  done
 }

 plugin-install "$@"
--- a/plugin.toml
+++ b/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku postgres service plugin"
-version = "1.13.0"
+version = "1.14.1"
 [plugin.config]
--- a/19
+++ b/19
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config"
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common-functions"
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+plugin-post-app-clone-setup() {
+  declare OLD_APP_NAME="$1" NEW_APP_NAME="$2"
+
+  local SERVICES=$(ls "$PLUGIN_DATA_ROOT" 2>/dev/null)
+  for SERVICE in $SERVICES; do
+    if in_links_file "$SERVICE" "$OLD_APP_NAME"; then
+      add_to_links_file "$SERVICE" "$NEW_APP_NAME"
+    fi
+  done
+}
+
+plugin-post-app-clone-setup "$@"
--- a/19
+++ b/19
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config"
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common-functions"
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+plugin-post-app-rename-setup() {
+  declare OLD_APP_NAME="$1" NEW_APP_NAME="$2"
+
+  local SERVICES=$(ls "$PLUGIN_DATA_ROOT" 2>/dev/null)
+  for SERVICE in $SERVICES; do
+    if in_links_file "$SERVICE" "$OLD_APP_NAME"; then
+      add_to_links_file "$SERVICE" "$NEW_APP_NAME"
+    fi
+  done
+}
+
+plugin-post-app-rename-setup "$@"
--- a/subcommands/backup
+++ b/subcommands/backup
@@ -6,12 +6,14 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-backup-cmd() {
-  #E backup the 'lolipop' service to the 'my-s3-bucket' bucket on AWS
-  #E dokku $PLUGIN_COMMAND_PREFIX:backup lolipop my-s3-bucket --use-iam
+  #E backup the 'lollipop' service to the 'my-s3-bucket' bucket on AWS
+  #E dokku $PLUGIN_COMMAND_PREFIX:backup lollipop my-s3-bucket --use-iam
+  #E restore a backup file (assuming it was extracted via 'tar -xf backup.tgz')
+  #E dokku $PLUGIN_COMMAND_PREFIX:import lollipop < backup-folder/export
  #F -u|--use-iam, use the IAM profile associated with the current server
  #A service, service to run command against
  #A bucket-name, name of the s3 bucket to upload backups to
-  declare desc="creates a backup of the $PLUGIN_SERVICE service to an existing s3 bucket"
+  declare desc="create a backup of the $PLUGIN_SERVICE service to an existing s3 bucket"
  local cmd="$PLUGIN_COMMAND_PREFIX:backup" argv=("$@")
  [[ ${argv[0]} == "$cmd" ]] && shift 1
  declare SERVICE="$1" BUCKET_NAME="$2" USE_IAM_OPTIONAL_FLAG="$3"
--- a/subcommands/backup-auth
+++ b/subcommands/backup-auth
@@ -7,20 +7,20 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-backup-auth-cmd() {
  #E setup s3 backup authentication
-  #E dokku $PLUGIN_COMMAND_PREFIX:backup-auth lolipop AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY
+  #E dokku $PLUGIN_COMMAND_PREFIX:backup-auth lollipop AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY
  #E setup s3 backup authentication with different region
-  #E dokku $PLUGIN_COMMAND_PREFIX:backup-auth lolipop AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_REGION
+  #E dokku $PLUGIN_COMMAND_PREFIX:backup-auth lollipop AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_REGION
  #E setup s3 backup authentication with different signature version and endpoint
-  #E dokku $PLUGIN_COMMAND_PREFIX:backup-auth lolipop AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_REGION AWS_SIGNATURE_VERSION ENDPOINT_URL
+  #E dokku $PLUGIN_COMMAND_PREFIX:backup-auth lollipop AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_REGION AWS_SIGNATURE_VERSION ENDPOINT_URL
  #E more specific example for minio auth
-  #E dokku $PLUGIN_COMMAND_PREFIX:backup-auth lolipop MINIO_ACCESS_KEY_ID MINIO_SECRET_ACCESS_KEY us-east-1 s3v4 https://YOURMINIOSERVICE
+  #E dokku $PLUGIN_COMMAND_PREFIX:backup-auth lollipop MINIO_ACCESS_KEY_ID MINIO_SECRET_ACCESS_KEY us-east-1 s3v4 https://YOURMINIOSERVICE
  #A service, service to run command against
  #A access-key-id, an amazon AWS_ACCESS_KEY_ID
  #A aws-secret-access-key, an amazon AWS_SECRET_ACCESS_KEY
  #A aws-default-region, (optional) a valid amazon S3 region
  #A aws-signature-version, (optional) the AWS signature version to use when signing S3 requests
  #A endpoint-url, (optional) an aws endpoint to upload to
-  declare desc="sets up authentication for backups on the $PLUGIN_SERVICE service"
+  declare desc="set up authentication for backups on the $PLUGIN_SERVICE service"
  local cmd="$PLUGIN_COMMAND_PREFIX:backup-auth" argv=("$@")
  [[ ${argv[0]} == "$cmd" ]] && shift 1
  declare SERVICE="$1" AWS_ACCESS_KEY_ID="$2" AWS_SECRET_ACCESS_KEY="$3" AWS_DEFAULT_REGION="$4" AWS_SIGNATURE_VERSION="$5" ENDPOINT_URL="$6"
--- a/subcommands/backup-deauth
+++ b/subcommands/backup-deauth
@@ -7,9 +7,9 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-backup-deauth-cmd() {
  #E remove s3 authentication
-  #E dokku $PLUGIN_COMMAND_PREFIX:backup-deauth lolipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:backup-deauth lollipop
  #A service, service to run command against
-  declare desc="removes backup authentication for the $PLUGIN_SERVICE service"
+  declare desc="remove backup authentication for the $PLUGIN_SERVICE service"
  local cmd="$PLUGIN_COMMAND_PREFIX:backup-deauth" argv=("$@")
  [[ ${argv[0]} == "$cmd" ]] && shift 1
  declare SERVICE="$1"
--- a/subcommands/backup-schedule
+++ b/subcommands/backup-schedule
@@ -8,14 +8,14 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 service-backup-schedule-cmd() {
  #E schedule a backup
  #E > 'schedule' is a crontab expression, eg. "0 3 * * *" for each day at 3am
-  #E dokku $PLUGIN_COMMAND_PREFIX:backup-schedule lolipop "0 3 * * *" my-s3-bucket
+  #E dokku $PLUGIN_COMMAND_PREFIX:backup-schedule lollipop "0 3 * * *" my-s3-bucket
  #E schedule a backup and authenticate via iam
-  #E dokku $PLUGIN_COMMAND_PREFIX:backup-schedule lolipop "0 3 * * *" my-s3-bucket --use-iam
+  #E dokku $PLUGIN_COMMAND_PREFIX:backup-schedule lollipop "0 3 * * *" my-s3-bucket --use-iam
  #F -u|--use-iam, use the IAM profile associated with the current server
  #A service, service to run command against
  #A schedule, a cron schedule to run backups on
  #A bucket-name, name of the s3 bucket to upload backups to
-  declare desc="schedules a backup of the $PLUGIN_SERVICE service"
+  declare desc="schedule a backup of the $PLUGIN_SERVICE service"
  local cmd="$PLUGIN_COMMAND_PREFIX:backup-schedule" argv=("$@")
  [[ ${argv[0]} == "$cmd" ]] && shift 1
  declare SERVICE="$1" SCHEDULE="$2" BUCKET_NAME="$3" USE_IAM_OPTIONAL_FLAG="$4"
--- a/subcommands/backup-schedule-cat
+++ b/subcommands/backup-schedule-cat
@@ -7,7 +7,7 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-backup-schedule-cat-cmd() {
  #E cat the contents of the configured backup cronfile for the service
-  #E dokku $PLUGIN_COMMAND_PREFIX:backup-schedule-cat lolipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:backup-schedule-cat lollipop
  #A service, service to run command against
  declare desc="cat the contents of the configured backup cronfile for the service"
  local cmd="$PLUGIN_COMMAND_PREFIX:backup-schedule-cat" argv=("$@")
--- a/subcommands/backup-set-encryption
+++ b/subcommands/backup-set-encryption
@@ -7,10 +7,10 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-backup-set-encryption-cmd() {
  #E set the GPG-compatible passphrase for encrypting backups for backups
-  #E dokku $PLUGIN_COMMAND_PREFIX:backup-set-encryption lolipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:backup-set-encryption lollipop
  #A service, service to run command against
  #A passphrase, a GPG-compatible passphrase
-  declare desc="sets encryption for all future backups of $PLUGIN_SERVICE service"
+  declare desc="set encryption for all future backups of $PLUGIN_SERVICE service"
  local cmd="$PLUGIN_COMMAND_PREFIX:backup-set-encryption" argv=("$@")
  [[ ${argv[0]} == "$cmd" ]] && shift 1
  declare SERVICE="$1" PASSPHRASE="$2"
--- a/subcommands/backup-unschedule
+++ b/subcommands/backup-unschedule
@@ -7,9 +7,9 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-backup-unschedule-cmd() {
  #E remove the scheduled backup from cron
-  #E dokku $PLUGIN_COMMAND_PREFIX:backup-unschedule lolipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:backup-unschedule lollipop
  #A service, service to run command against
-  declare desc="unschedules the backup of the $PLUGIN_SERVICE service"
+  declare desc="unschedule the backup of the $PLUGIN_SERVICE service"
  local cmd="$PLUGIN_COMMAND_PREFIX:backup-unschedule" argv=("$@")
  [[ ${argv[0]} == "$cmd" ]] && shift 1
  declare SERVICE="$1"
--- a/subcommands/backup-unset-encryption
+++ b/subcommands/backup-unset-encryption
@@ -7,9 +7,9 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-backup-unset-encryption-cmd() {
  #E unset the GPG encryption passphrase for backups
-  #E dokku $PLUGIN_COMMAND_PREFIX:backup-unset-encryption lolipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:backup-unset-encryption lollipop
  #A service, service to run command against
-  declare desc="unsets encryption for future backups of the $PLUGIN_SERVICE service"
+  declare desc="unset encryption for future backups of the $PLUGIN_SERVICE service"
  local cmd="$PLUGIN_COMMAND_PREFIX:backup-unset-encryption" argv=("$@")
  [[ ${argv[0]} == "$cmd" ]] && shift 1
  declare SERVICE="$1"
--- a/subcommands/clone
+++ b/subcommands/clone
@@ -7,14 +7,17 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-clone-cmd() {
  #E you can clone an existing service to a new one
-  #E dokku $PLUGIN_COMMAND_PREFIX:clone lolipop lolipop-2
+  #E dokku $PLUGIN_COMMAND_PREFIX:clone lollipop lollipop-2
  #A service, service to run command against
  #A new-service, name of new service
+  #F -c|--config-options "--args --go=here", extra arguments to pass to the container create command
  #F -C|--custom-env "USER=alpha;HOST=beta", semi-colon delimited environment variables to start the service with
  #F -i|--image IMAGE, the image name to start the service with
  #F -I|--image-version IMAGE_VERSION, the image version to start the service with
+  #F -m|--memory MEMORY, container memory limit (default: unlimited)
  #F -p|--password PASSWORD, override the user-level service password
  #F -r|--root-password PASSWORD, override the root-level service password
+  #F -s|--shm-size SHM_SIZE, override shared memory size for $PLUGIN_COMMAND_PREFIX docker container
  declare desc="create container <new-name> then copy data from <name> into <new-name>"
  local cmd="$PLUGIN_COMMAND_PREFIX:clone" argv=("$@")
  [[ ${argv[0]} == "$cmd" ]] && shift 1
--- a/subcommands/connect
+++ b/subcommands/connect
@@ -7,7 +7,8 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-connect-cmd() {
  #E connect to the service via the $PLUGIN_COMMAND_PREFIX connection tool
-  #E dokku $PLUGIN_COMMAND_PREFIX:connect lolipop
+  #E > NOTE: disconnecting from ssh while running this command may leave zombie processes due to moby/moby#9098
+  #E dokku $PLUGIN_COMMAND_PREFIX:connect lollipop
  #A service, service to run command against
  declare desc="connect to the service via the $PLUGIN_COMMAND_PREFIX connection tool"
  local cmd="$PLUGIN_COMMAND_PREFIX:connect" argv=("$@")
--- a/subcommands/create
+++ b/subcommands/create
@@ -6,23 +6,26 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-create-cmd() {
-  #E create a $PLUGIN_COMMAND_PREFIX service named lolipop
-  #E dokku $PLUGIN_COMMAND_PREFIX:create lolipop
+  #E create a $PLUGIN_COMMAND_PREFIX service named lollipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:create lollipop
  #E you can also specify the image and image version to use for the service.
  #E it *must* be compatible with the ${PLUGIN_IMAGE} image.
-  #E export ${PLUGIN_DEFAULT_ALIAS}_IMAGE="${PLUGIN_IMAGE}"
-  #E export ${PLUGIN_DEFAULT_ALIAS}_IMAGE_VERSION="${PLUGIN_IMAGE_VERSION}"
-  #E dokku $PLUGIN_COMMAND_PREFIX:create lolipop
+  #E export ${PLUGIN_VARIABLE}_IMAGE="${PLUGIN_IMAGE}"
+  #E export ${PLUGIN_VARIABLE}_IMAGE_VERSION="${PLUGIN_IMAGE_VERSION}"
+  #E dokku $PLUGIN_COMMAND_PREFIX:create lollipop
  #E you can also specify custom environment variables to start
  #E the ${PLUGIN_COMMAND_PREFIX} service in semi-colon separated form.
-  #E export ${PLUGIN_DEFAULT_ALIAS}_CUSTOM_ENV="USER=alpha;HOST=beta"
-  #E dokku $PLUGIN_COMMAND_PREFIX:create lolipop
+  #E export ${PLUGIN_VARIABLE}_CUSTOM_ENV="USER=alpha;HOST=beta"
+  #E dokku $PLUGIN_COMMAND_PREFIX:create lollipop
  #A service, service to run command against
+  #F -c|--config-options "--args --go=here", extra arguments to pass to the container create command
  #F -C|--custom-env "USER=alpha;HOST=beta", semi-colon delimited environment variables to start the service with
  #F -i|--image IMAGE, the image name to start the service with
  #F -I|--image-version IMAGE_VERSION, the image version to start the service with
+  #F -m|--memory MEMORY, container memory limit (default: unlimited)
  #F -p|--password PASSWORD, override the user-level service password
  #F -r|--root-password PASSWORD, override the root-level service password
+  #F -s|--shm-size SHM_SIZE, override shared memory size for $PLUGIN_COMMAND_PREFIX docker container
  declare desc="create a $PLUGIN_SERVICE service"
  local cmd="$PLUGIN_COMMAND_PREFIX:create" argv=("$@")
  [[ ${argv[0]} == "$cmd" ]] && shift 1
--- a/subcommands/destroy
+++ b/subcommands/destroy
@@ -7,7 +7,7 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-destroy-cmd() {
  #E destroy the service, it's data, and the running container
-  #E dokku $PLUGIN_COMMAND_PREFIX:destroy lolipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:destroy lollipop
  #A service, service to run command against
  #F -f|--force, force destroy without asking for confirmation
  declare desc="delete the $PLUGIN_SERVICE service/data/container if there are no links left"
--- a/subcommands/enter
+++ b/subcommands/enter
@@ -8,10 +8,11 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 service-enter-cmd() {
  #E a bash prompt can be opened against a running service.
  #E filesystem changes will not be saved to disk.
-  #E dokku $PLUGIN_COMMAND_PREFIX:enter lolipop
+  #E > NOTE: disconnecting from ssh while running this command may leave zombie processes due to moby/moby#9098
+  #E dokku $PLUGIN_COMMAND_PREFIX:enter lollipop
  #E you may also run a command directly against the service.
  #E filesystem changes will not be saved to disk.
-  #E dokku $PLUGIN_COMMAND_PREFIX:enter lolipop touch /tmp/test
+  #E dokku $PLUGIN_COMMAND_PREFIX:enter lollipop touch /tmp/test
  #A service, service to run command against
  declare desc="enter or run a command in a running $PLUGIN_SERVICE service container"
  local cmd="$PLUGIN_COMMAND_PREFIX:enter" argv=("$@")
--- a/subcommands/exists
+++ b/subcommands/exists
@@ -6,8 +6,8 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-exists-cmd() {
-  #E here we check if the lolipop $PLUGIN_COMMAND_PREFIX service exists.
-  #E dokku $PLUGIN_COMMAND_PREFIX:exists lolipop
+  #E here we check if the lollipop $PLUGIN_COMMAND_PREFIX service exists.
+  #E dokku $PLUGIN_COMMAND_PREFIX:exists lollipop
  #A service, service to run command against
  declare desc="check if the $PLUGIN_SERVICE service exists"
  local cmd="$PLUGIN_COMMAND_PREFIX:exists" argv=("$@")
--- a/subcommands/export
+++ b/subcommands/export
@@ -7,9 +7,9 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-export-cmd() {
  #E by default, datastore output is exported to stdout
-  #E dokku $PLUGIN_COMMAND_PREFIX:export lolipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:export lollipop
  #E you can redirect this output to a file
-  #E dokku $PLUGIN_COMMAND_PREFIX:export lolipop > lolipop.dump
+  #E dokku $PLUGIN_COMMAND_PREFIX:export lollipop > data.dump
  #A service, service to run command against
  declare desc="export a dump of the $PLUGIN_SERVICE service database"
  local cmd="$PLUGIN_COMMAND_PREFIX:export" argv=("$@")
--- a/subcommands/expose
+++ b/subcommands/expose
@@ -7,10 +7,12 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-expose-cmd() {
  #E expose the service on the service's normal ports, allowing access to it from the public interface (0.0.0.0)
-  #E dokku $PLUGIN_COMMAND_PREFIX:expose lolipop ${PLUGIN_DATASTORE_PORTS[@]}
+  #E dokku $PLUGIN_COMMAND_PREFIX:expose lollipop ${PLUGIN_DATASTORE_PORTS[@]}
+  #E expose the service on the service's normal ports, with the first on a specified ip adddress (127.0.0.1)
+  #E dokku $PLUGIN_COMMAND_PREFIX:expose lollipop 127.0.0.1:${PLUGIN_DATASTORE_PORTS[@]}
  #A service, service to run command against
  #A ports, a list of ports to run against
-  declare desc="expose a $PLUGIN_SERVICE service on custom port if provided (random port otherwise)"
+  declare desc="expose a $PLUGIN_SERVICE service on custom host:port if provided (random port on the 0.0.0.0 interface if otherwise unspecified)"
  local cmd="$PLUGIN_COMMAND_PREFIX:expose" argv=("$@")
  [[ ${argv[0]} == "$cmd" ]] && shift 1
  declare SERVICE="$1" PORTS_LIST=("${@:2}")
--- a/subcommands/import
+++ b/subcommands/import
@@ -7,7 +7,7 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-import-cmd() {
  #E import a datastore dump
-  #E dokku $PLUGIN_COMMAND_PREFIX:import lolipop < database.dump
+  #E dokku $PLUGIN_COMMAND_PREFIX:import lollipop < data.dump
  #A service, service to run command against
  declare desc="import a dump into the $PLUGIN_SERVICE service database"
  local cmd="$PLUGIN_COMMAND_PREFIX:import" argv=("$@")
--- a/subcommands/info
+++ b/subcommands/info
@@ -7,18 +7,18 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-info-cmd() {
  #E get connection information as follows:
-  #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:info lollipop
  #E you can also retrieve a specific piece of service info via flags:
-  #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --config-dir
-  #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --data-dir
-  #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --dsn
-  #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --exposed-ports
-  #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --id
-  #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --internal-ip
-  #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --links
-  #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --service-root
-  #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --status
-  #E dokku $PLUGIN_COMMAND_PREFIX:info lolipop --version
+  #E dokku $PLUGIN_COMMAND_PREFIX:info lollipop --config-dir
+  #E dokku $PLUGIN_COMMAND_PREFIX:info lollipop --data-dir
+  #E dokku $PLUGIN_COMMAND_PREFIX:info lollipop --dsn
+  #E dokku $PLUGIN_COMMAND_PREFIX:info lollipop --exposed-ports
+  #E dokku $PLUGIN_COMMAND_PREFIX:info lollipop --id
+  #E dokku $PLUGIN_COMMAND_PREFIX:info lollipop --internal-ip
+  #E dokku $PLUGIN_COMMAND_PREFIX:info lollipop --links
+  #E dokku $PLUGIN_COMMAND_PREFIX:info lollipop --service-root
+  #E dokku $PLUGIN_COMMAND_PREFIX:info lollipop --status
+  #E dokku $PLUGIN_COMMAND_PREFIX:info lollipop --version
  #A service, service to run command against
  #F --config-dir, show the service configuration directory
  #F --data-dir, show the service data directory
--- a/subcommands/link
+++ b/subcommands/link
@@ -10,20 +10,20 @@ service-link-cmd() {
  #E this will use native docker links via the docker-options plugin.
  #E here we link it to our 'playground' app.
  #E > NOTE: this will restart your app
-  #E dokku $PLUGIN_COMMAND_PREFIX:link lolipop playground
+  #E dokku $PLUGIN_COMMAND_PREFIX:link lollipop playground
  #E the following environment variables will be set automatically by docker
  #E (not on the app itself, so they won’t be listed when calling dokku config):
  #E
-  #E     DOKKU_${PLUGIN_DEFAULT_ALIAS}_LOLIPOP_NAME=/lolipop/DATABASE
-  #E     DOKKU_${PLUGIN_DEFAULT_ALIAS}_LOLIPOP_PORT=tcp://172.17.0.1:${PLUGIN_DATASTORE_PORTS[0]}
-  #E     DOKKU_${PLUGIN_DEFAULT_ALIAS}_LOLIPOP_PORT_${PLUGIN_DATASTORE_PORTS[0]}_TCP=tcp://172.17.0.1:${PLUGIN_DATASTORE_PORTS[0]}
-  #E     DOKKU_${PLUGIN_DEFAULT_ALIAS}_LOLIPOP_PORT_${PLUGIN_DATASTORE_PORTS[0]}_TCP_PROTO=tcp
-  #E     DOKKU_${PLUGIN_DEFAULT_ALIAS}_LOLIPOP_PORT_${PLUGIN_DATASTORE_PORTS[0]}_TCP_PORT=${PLUGIN_DATASTORE_PORTS[0]}
-  #E     DOKKU_${PLUGIN_DEFAULT_ALIAS}_LOLIPOP_PORT_${PLUGIN_DATASTORE_PORTS[0]}_TCP_ADDR=172.17.0.1
+  #E     DOKKU_${PLUGIN_VARIABLE}_LOLLIPOP_NAME=/lollipop/DATABASE
+  #E     DOKKU_${PLUGIN_VARIABLE}_LOLLIPOP_PORT=tcp://172.17.0.1:${PLUGIN_DATASTORE_PORTS[0]}
+  #E     DOKKU_${PLUGIN_VARIABLE}_LOLLIPOP_PORT_${PLUGIN_DATASTORE_PORTS[0]}_TCP=tcp://172.17.0.1:${PLUGIN_DATASTORE_PORTS[0]}
+  #E     DOKKU_${PLUGIN_VARIABLE}_LOLLIPOP_PORT_${PLUGIN_DATASTORE_PORTS[0]}_TCP_PROTO=tcp
+  #E     DOKKU_${PLUGIN_VARIABLE}_LOLLIPOP_PORT_${PLUGIN_DATASTORE_PORTS[0]}_TCP_PORT=${PLUGIN_DATASTORE_PORTS[0]}
+  #E     DOKKU_${PLUGIN_VARIABLE}_LOLLIPOP_PORT_${PLUGIN_DATASTORE_PORTS[0]}_TCP_ADDR=172.17.0.1
  #E
  #E the following will be set on the linked application by default:
  #E
-  #E     ${PLUGIN_DEFAULT_ALIAS}_URL=${PLUGIN_SCHEME}://lolipop:SOME_PASSWORD@dokku-${PLUGIN_COMMAND_PREFIX}-lolipop:${PLUGIN_DATASTORE_PORTS[0]}/lolipop
+  #E     ${PLUGIN_DEFAULT_ALIAS}_URL=${PLUGIN_SCHEME}://lollipop:SOME_PASSWORD@dokku-${PLUGIN_COMMAND_PREFIX}-lollipop:${PLUGIN_DATASTORE_PORTS[0]}/lollipop
  #E
  #E the host exposed here only works internally in docker containers.
  #E if you want your container to be reachable from outside, you should
@@ -34,10 +34,10 @@ service-link-cmd() {
  #E after linking will cause the plugin to think the service is not
  #E linked, and we advise you to unlink before proceeding.
  #E dokku config:set playground ${PLUGIN_VARIABLE}_DATABASE_SCHEME=${PLUGIN_SCHEME}2
-  #E dokku $PLUGIN_COMMAND_PREFIX:link lolipop playground
+  #E dokku $PLUGIN_COMMAND_PREFIX:link lollipop playground
  #E this will cause ${PLUGIN_DEFAULT_ALIAS}_URL to be set as:
  #E
-  #E     ${PLUGIN_SCHEME}2://lolipop:SOME_PASSWORD@dokku-${PLUGIN_COMMAND_PREFIX}-lolipop:${PLUGIN_DATASTORE_PORTS[0]}/lolipop
+  #E     ${PLUGIN_SCHEME}2://lollipop:SOME_PASSWORD@dokku-${PLUGIN_COMMAND_PREFIX}-lollipop:${PLUGIN_DATASTORE_PORTS[0]}/lollipop
  #A service, service to run command against
  #A app, app to run command against
  #F -a|--alias "BLUE_DATABASE", an alternative alias to use for linking to an app via environment variable
--- a/subcommands/linked
+++ b/subcommands/linked
@@ -6,8 +6,8 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-linked-cmd() {
-  #E here we check if the lolipop $PLUGIN_COMMAND_PREFIX service is linked to the 'playground' app.
-  #E dokku $PLUGIN_COMMAND_PREFIX:linked lolipop playground
+  #E here we check if the lollipop $PLUGIN_COMMAND_PREFIX service is linked to the 'playground' app.
+  #E dokku $PLUGIN_COMMAND_PREFIX:linked lollipop playground
  #A service, service to run command against
  #A app, app to run command against
  declare desc="check if the $PLUGIN_SERVICE service is linked to an app"
--- a/subcommands/links
+++ b/subcommands/links
@@ -6,8 +6,8 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-links-cmd() {
-  #E list all apps linked to the 'lolipop' $PLUGIN_COMMAND_PREFIX service.
-  #E dokku $PLUGIN_COMMAND_PREFIX:links lolipop
+  #E list all apps linked to the 'lollipop' $PLUGIN_COMMAND_PREFIX service.
+  #E dokku $PLUGIN_COMMAND_PREFIX:links lollipop
  #A service, service to run command against
  declare desc="list all apps linked to the $PLUGIN_SERVICE service"
  local cmd="$PLUGIN_COMMAND_PREFIX:links" argv=("$@")
--- a/subcommands/logs
+++ b/subcommands/logs
@@ -7,9 +7,9 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-logs-cmd() {
  #E you can tail logs for a particular service:
-  #E dokku $PLUGIN_COMMAND_PREFIX:logs lolipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:logs lollipop
  #E by default, logs will not be tailed, but you can do this with the --tail flag:
-  #E dokku $PLUGIN_COMMAND_PREFIX:logs lolipop --tail
+  #E dokku $PLUGIN_COMMAND_PREFIX:logs lollipop --tail
  #A service, service to run command against
  #F -t|--tail, do not stop when end of the logs are reached and wait for additional output
  declare desc="print the most recent log(s) for this service"
--- a/subcommands/promote
+++ b/subcommands/promote
@@ -20,7 +20,7 @@ service-promote-cmd() {
  #E
  #E     ${PLUGIN_DEFAULT_ALIAS}_URL=${PLUGIN_SCHEME}://other_service:ANOTHER_PASSWORD@dokku-${PLUGIN_COMMAND_PREFIX}-other-service:${PLUGIN_DATASTORE_PORTS[0]}/other_service
  #E     DOKKU_${PLUGIN_DEFAULT_ALIAS}_BLUE_URL=${PLUGIN_SCHEME}://other_service:ANOTHER_PASSWORD@dokku-${PLUGIN_COMMAND_PREFIX}-other-service:${PLUGIN_DATASTORE_PORTS[0]}/other_service
-  #E     DOKKU_${PLUGIN_DEFAULT_ALIAS}_SILVER_URL=${PLUGIN_SCHEME}://lolipop:SOME_PASSWORD@dokku-${PLUGIN_COMMAND_PREFIX}-lolipop:${PLUGIN_DATASTORE_PORTS[0]}/lolipop
+  #E     DOKKU_${PLUGIN_DEFAULT_ALIAS}_SILVER_URL=${PLUGIN_SCHEME}://lollipop:SOME_PASSWORD@dokku-${PLUGIN_COMMAND_PREFIX}-lollipop:${PLUGIN_DATASTORE_PORTS[0]}/lollipop
  #A service, service to run command against
  #A app, app to run command against
  declare desc="promote service <service> as ${PLUGIN_DEFAULT_ALIAS}_URL in <app>"
--- a/subcommands/restart
+++ b/subcommands/restart
@@ -7,7 +7,7 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-restart-cmd() {
  #E restart the service
-  #E dokku $PLUGIN_COMMAND_PREFIX:restart lolipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:restart lollipop
  #A service, service to run command against
  declare desc="graceful shutdown and restart of the $PLUGIN_SERVICE service container"
  local cmd="$PLUGIN_COMMAND_PREFIX:restart" argv=("$@")
--- a/subcommands/start
+++ b/subcommands/start
@@ -7,7 +7,7 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-start-cmd() {
  #E start the service
-  #E dokku $PLUGIN_COMMAND_PREFIX:start lolipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:start lollipop
  #A service, service to run command against
  declare desc="start a previously stopped $PLUGIN_SERVICE service"
  local cmd="$PLUGIN_COMMAND_PREFIX:start" argv=("$@")
--- a/subcommands/stop
+++ b/subcommands/stop
@@ -7,7 +7,7 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-stop-cmd() {
  #E stop the service and the running container
-  #E dokku $PLUGIN_COMMAND_PREFIX:stop lolipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:stop lollipop
  #A service, service to run command against
  declare desc="stop a running $PLUGIN_SERVICE service"
  local cmd="$PLUGIN_COMMAND_PREFIX:stop" argv=("$@")
--- a/subcommands/unexpose
+++ b/subcommands/unexpose
@@ -7,7 +7,7 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"

 service-unexpose-cmd() {
  #E unexpose the service, removing access to it from the public interface (0.0.0.0)
-  #E dokku $PLUGIN_COMMAND_PREFIX:unexpose lolipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:unexpose lollipop
  #A service, service to run command against
  declare desc="unexpose a previously exposed $PLUGIN_SERVICE service"
  local cmd="$PLUGIN_COMMAND_PREFIX:unexpose" argv=("$@")
--- a/subcommands/unlink
+++ b/subcommands/unlink
@@ -8,7 +8,7 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 service-unlink-cmd() {
  #E you can unlink a $PLUGIN_COMMAND_PREFIX service
  #E > NOTE: this will restart your app and unset related environment variables
-  #E dokku $PLUGIN_COMMAND_PREFIX:unlink lolipop playground
+  #E dokku $PLUGIN_COMMAND_PREFIX:unlink lollipop playground
  #A service, service to run command against
  #A app, app to run command against
  declare desc="unlink the $PLUGIN_SERVICE service from the app"
--- a/subcommands/upgrade
+++ b/subcommands/upgrade
@@ -8,12 +8,14 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"

 service-upgrade-cmd() {
  #E you can upgrade an existing service to a new image or image-version
-  #E dokku $PLUGIN_COMMAND_PREFIX:upgrade lolipop
+  #E dokku $PLUGIN_COMMAND_PREFIX:upgrade lollipop
  #A service, service to run command against
+  #F -c|--config-options "--args --go=here", extra arguments to pass to the container create command
  #F -C|--custom-env "USER=alpha;HOST=beta", semi-colon delimited environment variables to start the service with
  #F -i|--image IMAGE, the image name to start the service with
  #F -I|--image-version IMAGE_VERSION, the image version to start the service with
  #F -R|--restart-apps "true", whether to force an app restart
+  #F -s|--shm-size SHM_SIZE, override shared memory size for $PLUGIN_COMMAND_PREFIX docker container
  declare desc="upgrade service <service> to the specified versions"
  local cmd="$PLUGIN_COMMAND_PREFIX:upgrade" argv=("$@")
  [[ ${argv[0]} == "$cmd" ]] && shift 1
@@ -36,6 +38,8 @@ service-upgrade-cmd() {
    return
  fi

+  service_commit_config "$SERVICE"
+
  dokku_log_info2 "Upgrading $SERVICE to $NEW_PLUGIN_IMAGE_TAG"
  if [[ "$SERVICE_RESTART_APPS" == "true" ]]; then
    dokku_log_info2 "Stopping all linked services"
--- a/tests/shellcheck-to-junit
+++ b/tests/shellcheck-to-junit
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 import argparse
Author	SHA1	Message	Date
Jose Diaz-Gonzalez	32fdea93fd	Release 1.14.1	2021-09-13 04:34:07 -04:00
Jose Diaz-Gonzalez	42f07d10a8	fix: ensure cloned/renamed apps have a link to linked services Previously they would just 'disappear', resulting in broken applications until the app was relinked to the service in question. Closes dokku/dokku-redis#142	2021-09-13 04:28:33 -04:00
Jose Diaz-Gonzalez	5e3cf5fab4	Merge pull request #237 from fwolfst/fix_doc_typo remove trailing dot in shell command example	2021-09-13 04:25:15 -04:00
Felix Wolfsteller	4174b7e617	remove trailing dot in shell command example	2021-09-13 10:21:29 +02:00
Jose Diaz-Gonzalez	e4f475b31b	Release 1.14.0	2021-09-13 03:34:06 -04:00
Jose Diaz-Gonzalez	615db75c3d	docs: document how to convert the data dump to plain sql Closes #214	2021-09-13 03:27:29 -04:00
Jose Diaz-Gonzalez	2af9cb0203	fix: drop unecessary database dump This was part of a test and inadvertently committed...	2021-09-13 03:26:54 -04:00
Jose Diaz-Gonzalez	6bfd8040a2	docs: use a 'standard' name for the data dump	2021-09-13 03:25:06 -04:00
Jose Diaz-Gonzalez	b2e1a78073	docs: document the possibility of zombie processes on ssh disconnect for :connect and :enter commands Apparently terminating the ssh connection that runs 'docker exec' may result in a process leak as the signal isn't propagated properly (moby/moby#9098). Since we cannot fix this, we should document it so that users do not stumble upon the issue unawares. Closes dokku/dokku-postgres#212	2021-09-13 03:21:23 -04:00
Jose Diaz-Gonzalez	8b002c7a7c	fix: do not create the new database automatically This should only be done if importing a given database. Instead, always import into the specified database name. Refs #218	2021-09-13 02:59:01 -04:00
Jose Diaz-Gonzalez	7ca7c20ef8	fix: pin the image and image version of a created service at creation time This will help ensure that users upgrading to a new plugin version who stop/start databases will always get the same version. This is particularly important for datastores such as elasticsearch and postgres that have more involved upgraded processes.	2021-09-13 02:28:41 -04:00
Jose Diaz-Gonzalez	36b5a80263	docs: document using postgis The previous example on using an alternative image isn't verbose enough for some users, so we use the new readme generation facilities to inject a note for postgis usage. Closes #213	2021-09-13 01:37:22 -04:00
Jose Diaz-Gonzalez	5855d1bdd5	docs: document the process of upgrading major postgres versions While it would be nice to automatically handle this, there is a ton of pain in doing so. Rather than being smart about it, document the process so that users can make rational decisions about their upgrade process. Closes dokku/dokku-postgres#219	2021-09-13 01:26:58 -04:00
Jose Diaz-Gonzalez	b8a8b139f9	docs: add folder for supplementary documentation	2021-09-13 01:23:26 -04:00
Jose Diaz-Gonzalez	0d84637c85	docs: add ability to inject supplementary documentation into the readme Some commands - such as link or upgrade - have extra documenation on a per-plugin basis. Rather than make some sort of weird templating logic in the help output generation, that documentation is added directly to the repository and then injected at generation time.	2021-09-13 01:21:19 -04:00
Jose Diaz-Gonzalez	d72138aad3	docs: properly spell lollipop I've been misspelling my stand-in variable name for years...	2021-09-13 00:57:34 -04:00
Jose Diaz-Gonzalez	3ab20b0b4f	feat: allow setting shm-size on created containers Refs dokku/dokku-postgres#188 Closes dokku/dokku-postgres#201	2021-09-13 00:46:48 -04:00
Jose Diaz-Gonzalez	9e6d072531	Merge pull request #208 from Schlepptop/fix-unlink Fix #203	2021-09-13 00:03:05 -04:00
Jose Diaz-Gonzalez	254c68c326	Merge branch 'master' into fix-unlink	2021-09-13 00:02:52 -04:00
Jose Diaz-Gonzalez	0387c2d30b	feat: restore the imported database to the service's database Refs #207	2021-09-12 23:48:10 -04:00
Jose Diaz-Gonzalez	4cef2b9207	docs: correctly represent the url and env vars that get injected via docker link Closes dokku/dokku-postgres#221	2021-09-12 23:38:52 -04:00
Jose Diaz-Gonzalez	7a17f22d6c	docs: fix the variable reference for plugins where the alias does not match the variable Closes dokku/dokku-postgres#199	2021-09-12 22:55:02 -04:00
Jose Diaz-Gonzalez	535f40143d	Merge pull request #228 from benatkin/function-command-desc-tense make tense in command descriptions more consistent	2021-09-12 22:37:36 -04:00
Benjamin Atkin	952036bbaa	make tense in command descriptions more consistent	2021-09-12 22:36:31 -04:00
Jose Diaz-Gonzalez	1b37774e05	chore: drop extra print in readme generator	2021-09-12 22:33:06 -04:00
Jose Diaz-Gonzalez	db78a92687	dev: add file (for linting) and nano (for in-container editing) to devcontainer	2021-09-12 22:20:42 -04:00
Jose Diaz-Gonzalez	6d948290e7	fix: use updated python shebang	2021-09-12 22:18:01 -04:00
Jose Diaz-Gonzalez	1afdffef8d	feat: add ability to set container config options during create/clone/upgrade actions Also add to documentation where possible. Closes dokku/dokku-mongo#131	2021-09-12 22:16:14 -04:00
Jose Diaz-Gonzalez	38bfaea286	fix: allow non-english characters in :connect shell Closes dokku/dokku-mysql#116	2021-09-12 08:24:58 -04:00
Jose Diaz-Gonzalez	e85d96b3a1	feat: add the ability to constrain memory on service start/clone Refs dokku/dokku-redis#86	2021-09-12 07:43:02 -04:00
Jose Diaz-Gonzalez	0657f47442	docs: add a note as to how to specify an interface/ip to bind on when exposing a service Closes dokku/dokku-mongo#128	2021-09-12 07:09:55 -04:00
Jose Diaz-Gonzalez	2b4ff03bff	docs: translate single-quotes into backticks	2021-09-12 07:01:58 -04:00
Jose Diaz-Gonzalez	2c7a655c87	docs: document how to restore a backup	2021-09-12 06:59:50 -04:00
schlepptop	34f02b6aa4	Empty commit; trigger retest	2020-07-19 14:26:01 +02:00
schlepptop	fc7ddc3e2a	Fix #203	2020-07-18 16:55:23 +02:00