[pull] master from dokku:master

.github/dependabot.yml

@@ -1,6 +1,12 @@
+---
 version: 2
 updates:
   - package-ecosystem: "docker"
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10

.github/workflows/ci.yml

@@ -5,28 +5,30 @@ name: CI
 on:
   pull_request:
     branches:
-      - '*'
+      - "*"
   push:
     branches:
       - master
 
+concurrency:
+  group: build-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   unit-tests-master:
     name: unit-tests
-    runs-on: ubuntu-18.04
-    strategy:
-      fail-fast: true
+    runs-on: ubuntu-24.04
     env:
       DOKKU_VERSION: master
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.7.x'
+          python-version: "3.13"
 
       - run: make setup
 
@@ -49,28 +51,26 @@ jobs:
 
       - run: make test
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: tmp/test-results
           path: test-results
 
   unit-tests-0_19_0:
     name: unit-tests-0.19.0
-    runs-on: ubuntu-18.04
-    strategy:
-      fail-fast: true
+    runs-on: ubuntu-24.04
     env:
       DOKKU_TAG: v0.19.0
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.7.x'
+          python-version: "3.13"
 
       - run: make setup
 
@@ -93,7 +93,7 @@ jobs:
 
       - run: make test
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: tmp/test-results

.github/workflows/tagged-release.yml

@@ -0,0 +1,20 @@
+---
+name: "tagged-release"
+
+# yamllint disable-line rule:truthy
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  tagged-release:
+    name: tagged-release
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Release
+        uses: softprops/[email protected]
+        with:
+          generate_release_notes: true
+          make_latest: "true"

Dockerfile

@@ -1 +1 @@
-FROM mongo:5.0.9
+FROM mongo:8.2.1

Makefile

@@ -1,5 +1,6 @@
 HARDWARE = $(shell uname -m)
 SYSTEM_NAME  = $(shell uname -s | tr '[:upper:]' '[:lower:]')
+ARCH = $(shell dpkg --print-architecture)
 SHFMT_VERSION = 3.0.2
 XUNIT_TO_GITHUB_VERSION = 0.3.0
 XUNIT_READER_VERSION = 0.1.0
@@ -21,7 +22,11 @@ ifneq ($(shell shellcheck --version >/dev/null 2>&1 ; echo $$?),0)
 ifeq ($(SYSTEM_NAME),darwin)
 	brew install shellcheck
 else
-	sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse'
+ifeq ($(ARCH),arm64)
+  sudo add-apt-repository 'deb http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse'
+else
+  sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu jammy-backports main restricted universe multiverse'
+endif
 	sudo rm -rf /var/lib/apt/lists/* && sudo apt-get clean
 	sudo apt-get update -qq && sudo apt-get install -qq -y shellcheck
 endif

README.md

@@ -1,6 +1,6 @@
 # dokku mongo [![Build Status](https://img.shields.io/github/actions/workflow/status/dokku/dokku-mongo/ci.yml?branch=master&style=flat-square "Build Status")](https://github.com/dokku/dokku-mongo/actions/workflows/ci.yml?query=branch%3Amaster) [![IRC Network](https://img.shields.io/badge/irc-libera-blue.svg?style=flat-square "IRC Libera")](https://webchat.libera.chat/?channels=dokku)
 
-Official mongo plugin for dokku. Currently defaults to installing [mongo 5.0.9](https://hub.docker.com/_/mongo/).
+Official mongo plugin for dokku. Currently defaults to installing [mongo 8.2.1](https://hub.docker.com/_/mongo/).
 
 ## Requirements
 
@@ -11,7 +11,7 @@ Official mongo plugin for dokku. Currently defaults to installing [mongo 5.0.9](
 
 ```shell
 # on 0.19.x+
-sudo dokku plugin:install https://github.com/dokku/dokku-mongo.git mongo
+sudo dokku plugin:install https://github.com/dokku/dokku-mongo.git --name mongo
 ```
 
 ## Commands
@@ -24,8 +24,10 @@ mongo:backup-deauth <service>                      # remove backup authenticatio
 mongo:backup-schedule <service> <schedule> <bucket-name> [--use-iam] # schedule a backup of the mongo service
 mongo:backup-schedule-cat <service>                # cat the contents of the configured backup cronfile for the service
 mongo:backup-set-encryption <service> <passphrase> # set encryption for all future backups of mongo service
+mongo:backup-set-public-key-encryption <service> <public-key-id> # set GPG Public Key encryption for all future backups of mongo service
 mongo:backup-unschedule <service>                  # unschedule the backup of the mongo service
 mongo:backup-unset-encryption <service>            # unset encryption for future backups of the mongo service
+mongo:backup-unset-public-key-encryption <service> # unset GPG Public Key encryption for future backups of the mongo service
 mongo:clone <service> <new-service> [--clone-flags...] # create container <new-name> then copy data from <name> into <new-name>
 mongo:connect <service>                            # connect to the service via the mongo connection tool
 mongo:connect-admin <service>                      # connect via mongo to a mongo service as admin user
@@ -45,6 +47,7 @@ mongo:logs <service> [-t|--tail] <tail-num-optional> # print the most recent log
 mongo:pause <service>                              # pause a running mongo service
 mongo:promote <service> <app>                      # promote service <service> as MONGO_URL in <app>
 mongo:restart <service>                            # graceful shutdown and restart of the mongo service container
+mongo:set <service> <key> <value>                  # set or clear a property for a service
 mongo:start <service>                              # start a previously stopped mongo service
 mongo:stop <service>                               # stop a running mongo service
 mongo:unexpose <service>                           # unexpose a previously exposed mongo service
@@ -72,8 +75,11 @@ flags:
 - `-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 in megabytes (default: unlimited)
+- `-N|--initial-network INITIAL_NETWORK`: the initial network to attach the service to
 - `-p|--password PASSWORD`: override the user-level service password
+- `-P|--post-create-network NETWORKS`: a comma-separated list of networks to attach the service container to after service creation
 - `-r|--root-password PASSWORD`: override the root-level service password
+- `-S|--post-start-network NETWORKS`: a comma-separated list of networks to attach the service container to after service start
 - `-s|--shm-size SHM_SIZE`: override shared memory size for mongo docker container
 
 Create a mongo service named lollipop:
@@ -90,7 +96,7 @@ export MONGO_IMAGE_VERSION="${PLUGIN_IMAGE_VERSION}"
 dokku mongo:create lollipop
 ```
 
-You can also specify custom environment variables to start the mongo service in semi-colon separated form.
+You can also specify custom environment variables to start the mongo service in semicolon-separated form.
 
 ```shell
 export MONGO_CUSTOM_ENV="USER=alpha;HOST=beta"
@@ -112,7 +118,10 @@ flags:
 - `--exposed-ports`: show service exposed ports
 - `--id`: show the service container id
 - `--internal-ip`: show the service internal ip
+- `--initial-network`: show the initial network being connected to
 - `--links`: show the service app links
+- `--post-create-network`: show the networks to attach to after service container creation
+- `--post-start-network`: show the networks to attach to after service container start
 - `--service-root`: show the service root directory
 - `--status`: show the service running status
 - `--version`: show the service image version
@@ -132,7 +141,10 @@ dokku mongo:info lollipop --dsn
 dokku mongo:info lollipop --exposed-ports
 dokku mongo:info lollipop --id
 dokku mongo:info lollipop --internal-ip
+dokku mongo:info lollipop --initial-network
 dokku mongo:info lollipop --links
+dokku mongo:info lollipop --post-create-network
+dokku mongo:info lollipop --post-start-network
 dokku mongo:info lollipop --service-root
 dokku mongo:info lollipop --status
 dokku mongo:info lollipop --version
@@ -142,7 +154,7 @@ dokku mongo:info lollipop --version
 
 ```shell
 # usage
-dokku mongo:list 
+dokku mongo:list
 ```
 
 List all services:
@@ -191,6 +203,7 @@ 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
+- `-n|--no-restart "false"`: whether or not to restart the app on link (default: true)
 
 A mongo 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.
 
@@ -243,6 +256,10 @@ mongodb2://lollipop:SOME_PASSWORD@dokku-mongo-lollipop:27017/lollipop
 dokku mongo:unlink <service> <app>
 ```
 
+flags:
+
+- `-n|--no-restart "false"`: whether or not to restart the app on unlink (default: true)
+
 You can unlink a mongo service:
 
 > NOTE: this will restart your app and unset related environment variables
@@ -251,6 +268,31 @@ You can unlink a mongo service:
 dokku mongo:unlink lollipop playground
 ```
 
+### set or clear a property for a service
+
+```shell
+# usage
+dokku mongo:set <service> <key> <value>
+```
+
+Set the network to attach after the service container is started:
+
+```shell
+dokku mongo:set lollipop post-create-network custom-network
+```
+
+Set multiple networks:
+
+```shell
+dokku mongo:set lollipop post-create-network custom-network,other-network
+```
+
+Unset the post-create-network value:
+
+```shell
+dokku mongo:set lollipop post-create-network
+```
+
 ### Service Lifecycle
 
 The lifecycle of each service can be managed through the following commands:
@@ -304,7 +346,7 @@ Expose the service on the service's normal ports, allowing access to it from the
 dokku mongo:expose lollipop 27017 27018 27019 28017
 ```
 
-Expose the service on the service's normal ports, with the first on a specified ip adddress (127.0.0.1):
+Expose the service on the service's normal ports, with the first on a specified ip address (127.0.0.1):
 
 ```shell
 dokku mongo:expose lollipop 127.0.0.1:27017 27018 27019 28017
@@ -417,7 +459,10 @@ flags:
 - `-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
+- `-N|--initial-network INITIAL_NETWORK`: the initial network to attach the service to
+- `-P|--post-create-network NETWORKS`: a comma-separated list of networks to attach the service container to after service creation
+- `-R|--restart-apps "true"`: whether or not to force an app restart (default: false)
+- `-S|--post-start-network NETWORKS`: a comma-separated list of networks to attach the service container to after service start
 - `-s|--shm-size SHM_SIZE`: override shared memory size for mongo docker container
 
 You can upgrade an existing service to a new image or image-version:
@@ -457,8 +502,11 @@ flags:
 - `-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 in megabytes (default: unlimited)
+- `-N|--initial-network INITIAL_NETWORK`: the initial network to attach the service to
 - `-p|--password PASSWORD`: override the user-level service password
+- `-P|--post-create-network NETWORKS`: a comma-separated list of networks to attach the service container to after service creation
 - `-r|--root-password PASSWORD`: override the root-level service password
+- `-S|--post-start-network NETWORKS`: a comma-separated list of networks to attach the service container to after service start
 - `-s|--shm-size SHM_SIZE`: override shared memory size for mongo docker container
 
 You can clone an existing service to a new one:
@@ -630,6 +678,19 @@ Set the GPG-compatible passphrase for encrypting backups for backups:
 dokku mongo:backup-set-encryption lollipop
 ```
 
+### set GPG Public Key encryption for all future backups of mongo service
+
+```shell
+# usage
+dokku mongo:backup-set-public-key-encryption <service> <public-key-id>
+```
+
+Set the `GPG` Public Key for encrypting backups:
+
+```shell
+dokku mongo:backup-set-public-key-encryption lollipop
+```
+
 ### unset encryption for future backups of the mongo service
 
 ```shell
@@ -643,6 +704,19 @@ Unset the `GPG` encryption passphrase for backups:
 dokku mongo:backup-unset-encryption lollipop
 ```
 
+### unset GPG Public Key encryption for future backups of the mongo service
+
+```shell
+# usage
+dokku mongo:backup-unset-public-key-encryption <service>
+```
+
+Unset the `GPG` Public Key encryption for backups:
+
+```shell
+dokku mongo:backup-unset-public-key-encryption lollipop
+```
+
 ### schedule a backup of the mongo service
 
 ```shell
@@ -694,8 +768,8 @@ Remove the scheduled backup from cron:
 dokku mongo:backup-unschedule lollipop
 ```
 
-### Disabling `docker pull` calls
+### Disabling `docker image pull` calls
 
-If you wish to disable the `docker pull` calls that the plugin triggers, you may set the `MONGO_DISABLE_PULL` environment variable to `true`. Once disabled, you will need to pull the service image you wish to deploy as shown in the `stderr` output.
+If you wish to disable the `docker image pull` calls that the plugin triggers, you may set the `MONGO_DISABLE_PULL` environment variable to `true`. Once disabled, you will need to pull the service image you wish to deploy as shown in the `stderr` output.
 
-Please ensure the proper images are in place when `docker pull` is disabled.
+Please ensure the proper images are in place when `docker image pull` is disabled.

Vagrantfile

@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-BOX_NAME = ENV["BOX_NAME"] || "bento/ubuntu-18.04"
+BOX_NAME = ENV["BOX_NAME"] || "bento/ubuntu-24.04"
 BOX_MEMORY = ENV["BOX_MEMORY"] || "2048"
 DOKKU_VERSION = "master"