更新 Dockerfile

修改镜像地址
Merge pull request #240 from dokku/dependabot/github_actions/softprops/action-gh-release-2.4.1
2025-10-17 00:40:08 +08:00 · 2025-10-17 00:13:25 +08:00 · 2025-10-13 18:09:49 -04:00 · 2025-10-13 14:12:29 +00:00 · 2025-10-07 14:04:53 -04:00 · 2025-10-07 13:06:29 +00:00
15 changed files with 141 additions and 33 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ name: CI
 on:
  pull_request:
    branches:
-      - '*'
+      - "*"
  push:
    branches:
      - master
@@ -17,18 +17,18 @@ concurrency:
 jobs:
  unit-tests-master:
    name: unit-tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
    env:
      DOKKU_VERSION: master

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
        with:
          fetch-depth: 0

-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
        with:
-          python-version: '3.7.x'
+          python-version: "3.13"

      - run: make setup

@@ -51,7 +51,7 @@ jobs:

      - run: make test

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        if: failure()
        with:
          name: tmp/test-results
@@ -59,18 +59,18 @@ jobs:

  unit-tests-0_19_0:
    name: unit-tests-0.19.0
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
    env:
      DOKKU_TAG: v0.19.0

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
        with:
          fetch-depth: 0

-      - uses: actions/setup-python@v5
+      - 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@v3
+      - uses: actions/upload-artifact@v4
        if: failure()
        with:
          name: tmp/test-results
--- a/.github/workflows/tagged-release.yml
+++ b/.github/workflows/tagged-release.yml
@@ -5,15 +5,16 @@ name: "tagged-release"
 on:
  push:
    tags:
-      - '*'
+      - "*"

 jobs:
  tagged-release:
    name: tagged-release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04

    steps:
-      - uses: "marvinpinto/action-automatic-releases@v1.2.1"
+      - name: Release
+        uses: softprops/action-gh-release@v2.4.1
        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          prerelease: false
+          generate_release_notes: true
+          make_latest: "true"
--- a/2
+++ b/2
@@ -1 +1 @@
-FROM mongo:7.0.4
+FROM mirror.ccs.tencentyun.com/library/mongo:8.0.15
--- a/5
+++ b/5
@@ -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
@@ -20,8 +21,12 @@ shellcheck:
 ifneq ($(shell shellcheck --version >/dev/null 2>&1 ; echo $$?),0)
 ifeq ($(SYSTEM_NAME),darwin)
 	brew install shellcheck
+else
+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
--- a/README.md
+++ b/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 7.0.4](https://hub.docker.com/_/mongo/).
+Official mongo plugin for dokku. Currently defaults to installing [mongo 8.0.15](https://hub.docker.com/_/mongo/).

 ## Requirements

@@ -11,7 +11,7 @@ Official mongo plugin for dokku. Currently defaults to installing [mongo 7.0.4](

 ```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
@@ -344,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
@@ -676,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
@@ -689,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
--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :

-BOX_NAME = ENV["BOX_NAME"] || "bento/ubuntu-22.04"
+BOX_NAME = ENV["BOX_NAME"] || "bento/ubuntu-24.04"
 BOX_MEMORY = ENV["BOX_MEMORY"] || "2048"
 DOKKU_VERSION = "master"

--- a/bin/generate
+++ b/bin/generate
@@ -110,7 +110,7 @@ def installation_section(service, dokku_version):
            "",
            "```shell",
            f"# on {dokku_version}",
-            f"sudo dokku plugin:install https://github.com/dokku/dokku-{service}.git {service}",
+            f"sudo dokku plugin:install https://github.com/dokku/dokku-{service}.git --name {service}",
            "```",
        ]
    )
@@ -290,7 +290,9 @@ def usage_backup(
        "backup-deauth",
        "backup",
        "backup-set-encryption",
+        "backup-set-public-key-encryption",
        "backup-unset-encryption",
+        "backup-unset-public-key-encryption",
        "backup-schedule",
        "backup-schedule-cat",
        "backup-unschedule",
--- a/23
+++ b/23
@@ -308,6 +308,10 @@ service_backup() {
    BACKUP_PARAMETERS="$BACKUP_PARAMETERS -e ENCRYPTION_KEY=$(cat "$BACKUP_ENCRYPTION_CONFIG_ROOT/ENCRYPTION_KEY")"
  fi

+  if [[ -f "$BACKUP_ENCRYPTION_CONFIG_ROOT/ENCRYPT_WITH_PUBLIC_KEY_ID" ]]; then
+    BACKUP_PARAMETERS="$BACKUP_PARAMETERS -e ENCRYPT_WITH_PUBLIC_KEY_ID=$(cat "$BACKUP_ENCRYPTION_CONFIG_ROOT/ENCRYPT_WITH_PUBLIC_KEY_ID")"
+  fi
+
  # shellcheck disable=SC2086
  "$DOCKER_BIN" container run --rm $BACKUP_PARAMETERS "$PLUGIN_S3BACKUP_IMAGE"
 }
@@ -433,6 +437,16 @@ service_backup_set_encryption() {
  echo "$ENCRYPTION_KEY" >"${SERVICE_BACKUP_ENCRYPTION_ROOT}/ENCRYPTION_KEY"
 }

+service_backup_set_public_key_encryption() {
+  declare desc="set up backup GPG Public Key encryption"
+  declare SERVICE="$1" ENCRYPT_WITH_PUBLIC_KEY_ID="$2"
+  local SERVICE_ROOT="${PLUGIN_DATA_ROOT}/${SERVICE}"
+  local SERVICE_BACKUP_ENCRYPTION_ROOT="${SERVICE_ROOT}/backup-encryption/"
+
+  mkdir "$SERVICE_BACKUP_ENCRYPTION_ROOT"
+  echo "$ENCRYPT_WITH_PUBLIC_KEY_ID" >"${SERVICE_BACKUP_ENCRYPTION_ROOT}/ENCRYPT_WITH_PUBLIC_KEY_ID"
+}
+
 service_backup_unschedule() {
  declare desc="unschedule the backup of the service"
  declare SERVICE="$1"
@@ -450,6 +464,15 @@ service_backup_unset_encryption() {
  rm -rf "$SERVICE_BACKUP_ENCRYPTION_ROOT"
 }

+service_backup_unset_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/"
+
+  rm -rf "$SERVICE_BACKUP_ENCRYPTION_ROOT"
+}
+
 service_container_rm() {
  declare desc="stop a service and remove the running container"
  declare SERVICE="$1"
--- a/8
+++ b/8
@@ -28,9 +28,9 @@ if [[ -n $DOKKU_API_VERSION ]]; then
  export PLUGIN_BASE_PATH="$PLUGIN_ENABLED_PATH"
 fi

-export PLUGIN_BUSYBOX_IMAGE="busybox:1.34.1-uclibc"
-export PLUGIN_AMBASSADOR_IMAGE="dokku/ambassador:0.5.0"
-export PLUGIN_S3BACKUP_IMAGE="dokku/s3backup:0.14.0"
-export PLUGIN_WAIT_IMAGE="dokku/wait:0.6.0"
+export PLUGIN_BUSYBOX_IMAGE=${PLUGIN_BUSYBOX_IMAGE:=busybox:1.37.0-uclibc}
+export PLUGIN_AMBASSADOR_IMAGE=${PLUGIN_AMBASSADOR_IMAGE:=dokku/ambassador:0.8.2}
+export PLUGIN_S3BACKUP_IMAGE=${PLUGIN_S3BACKUP_IMAGE:=dokku/s3backup:0.18.0}
+export PLUGIN_WAIT_IMAGE=${PLUGIN_WAIT_IMAGE:=dokku/wait:0.9.3}

 export MONGO_CONFIG_OPTIONS=${MONGO_CONFIG_OPTIONS:=" --storageEngine wiredTiger --auth "}
--- a/plugin.toml
+++ b/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku mongo service plugin"
-version = "1.36.4"
+version = "1.38.13"
 [plugin.config]
--- a/subcommands/backup-set-public-key-encryption
+++ b/subcommands/backup-set-public-key-encryption
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+service-backup-set-public-key-encryption-cmd() {
+  #E set the GPG Public Key for encrypting backups
+  #E dokku $PLUGIN_COMMAND_PREFIX:backup-set-public-key-encryption lollipop
+  #A service, service to run command against
+  #A public-key-id, a GPG Public Key ID (or fingerprint) to use for encryption. Must be uploaded to the GPG keyserver beforehand.
+  declare desc="set GPG Public Key encryption for all future backups of $PLUGIN_SERVICE service"
+  local cmd="$PLUGIN_COMMAND_PREFIX:backup-set-public-key-encryption" argv=("$@")
+  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1" PUBLIC_KEY_ID="$2"
+  is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented"
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
+  [[ -z "$PUBLIC_KEY_ID" ]] && dokku_log_fail "Please specify a valid GPG Public Key ID (or fingerprint)"
+  verify_service_name "$SERVICE"
+  service_backup_set_public_key_encryption "$SERVICE" "$PUBLIC_KEY_ID"
+}
+
+service-backup-set-public-key-encryption-cmd "$@"
--- a/subcommands/backup-unset-public-key-encryption
+++ b/subcommands/backup-unset-public-key-encryption
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+service-backup-unset-public-key-encryption-cmd() {
+  #E unset the GPG Public Key encryption for backups
+  #E dokku $PLUGIN_COMMAND_PREFIX:backup-unset-public-key-encryption lollipop
+  #A service, service to run command against
+  declare desc="unset GPG Public Key encryption for future backups of the $PLUGIN_SERVICE service"
+  local cmd="$PLUGIN_COMMAND_PREFIX:backup-unset-public-key-encryption" argv=("$@")
+  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1"
+  is_implemented_command "$cmd" || dokku_log_fail "Not yet implemented"  # TODO: [22.03.2024 by Mykola]
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a valid name for the service"
+  verify_service_name "$SERVICE"
+  service_backup_unset_public_key_encryption "$SERVICE"  # TODO: [22.03.2024 by Mykola]
+}
+
+service-backup-unset-encryption-cmd "$@"
--- a/subcommands/expose
+++ b/subcommands/expose
@@ -8,7 +8,7 @@ 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 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 expose the service on the service's normal ports, with the first on a specified ip address (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
--- a/tests/link_networks.bats
+++ b/tests/link_networks.bats
@@ -48,7 +48,7 @@ teardown() {
  assert_output_contains bridge 0
  assert_output_contains custom-network

-  run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.ls -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.Aliases}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}'
+  run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.ls -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.DNSNames}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}'
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -120,7 +120,7 @@ teardown() {
  assert_output_contains custom-network
  assert_output_contains bridge

-  run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.ls -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.Aliases}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}'
+  run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.ls -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.DNSNames}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}'
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -192,7 +192,7 @@ teardown() {
  assert_output_contains bridge
  assert_output_contains custom-network

-  run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.ls -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.Aliases}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}'
+  run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.ls -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.DNSNames}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}'
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -258,7 +258,7 @@ teardown() {
  assert_output_contains bridge
  assert_output_contains custom-network

-  run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.lsa -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.Aliases}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}'
+  run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.lsa -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.DNSNames}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}'
  echo "output: $output"
  echo "status: $status"
  assert_success
--- a/tests/shellcheck-exclude
+++ b/tests/shellcheck-exclude
@@ -1,4 +1,5 @@
 # SC1090 - Can't follow non-constant source. Use a directive to specify location - https://github.com/koalaman/shellcheck/wiki/SC1090
+# SC1091 - Not following - <https://github.com/koalaman/shellcheck/wiki/SC1091>
 # SC2034 - Variable appears unused. Verify it or export it - https://github.com/koalaman/shellcheck/wiki/SC2034
 # SC2155 - Declare and assign separately to avoid masking return values - https://github.com/koalaman/shellcheck/wiki/SC2155
 # SC2206 - Quote to prevent word splitting/globbing, or split robustly with mapfile or read -a - https://github.com/koalaman/shellcheck/wiki/SC2206