Release 1.20.0

Merge pull request #177 from dokku/dependabot/docker/redis-7.0.0
chore(deps): bump redis from 6.2.6 to 7.0.0
2022-05-29 16:17:24 -04:00 · 2022-05-29 16:17:01 -04:00 · 2022-04-28 15:12:49 +00:00 · 2022-02-03 10:31:17 -05:00 · 2022-02-03 10:30:27 -05:00 · 2022-01-22 04:31:53 -05:00
7 changed files with 21 additions and 10 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-FROM redis:6.2.6
+FROM redis:7.0.0
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ 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
- `-m|--memory MEMORY`: container memory limit (default: unlimited)
+- `-m|--memory MEMORY`: container memory limit in megabytes (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 redis docker container
@@ -441,7 +441,7 @@ 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
- `-m|--memory MEMORY`: container memory limit (default: unlimited)
+- `-m|--memory MEMORY`: container memory limit in megabytes (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 redis docker container
--- a/12
+++ b/12
@@ -533,7 +533,11 @@ service_link() {
  fi
  [[ -n "$SERVICE_QUERYSTRING" ]] && SERVICE_URL="${SERVICE_URL}?${SERVICE_QUERYSTRING}"
  plugn trigger service-action post-link "$SERVICE" "$APP"
-  config_set "$APP" "${ALIAS}_URL=$SERVICE_URL"
+  if [[ "$DOKKU_GLOBAL_FLAGS" == *"--no-restart"* ]]; then
+    config_set --no-restart "$APP" "${ALIAS}_URL=$SERVICE_URL"
+  else
+    config_set "$APP" "${ALIAS}_URL=$SERVICE_URL"
+  fi
  plugn trigger service-action post-link-complete "$SERVICE" "$APP"
 }

@@ -857,7 +861,11 @@ service_unlink() {

  [[ -z ${LINK[*]} ]] && dokku_log_fail "Not linked to app $APP"
  plugn trigger service-action post-unlink "$SERVICE" "$APP"
-  config_unset "$APP" "${LINK[@]}"
+  if [[ "$DOKKU_GLOBAL_FLAGS" == *"--no-restart"* ]]; then
+    config_unset --no-restart "$APP" "${LINK[@]}"
+  else
+    config_unset "$APP" "${LINK[@]}"
+  fi
  plugn trigger service-action post-unlink-complete "$SERVICE" "$APP"
 }

--- a/7
+++ b/7
@@ -24,10 +24,10 @@ plugin-install() {
  pull-docker-image "$PLUGIN_WAIT_IMAGE"

  mkdir -p "$PLUGIN_DATA_ROOT" || echo "Failed to create $PLUGIN_SERVICE data directory"
-  chown dokku:dokku "$PLUGIN_DATA_ROOT"
+  chown "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "$PLUGIN_DATA_ROOT"

  mkdir -p "$PLUGIN_CONFIG_ROOT" || echo "Failed to create $PLUGIN_SERVICE config directory"
-  chown dokku:dokku "$PLUGIN_CONFIG_ROOT"
+  chown "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "$PLUGIN_CONFIG_ROOT"

  rm -f "/etc/sudoers.d/dokku-${PLUGIN_COMMAND_PREFIX}*"
  _SUDOERS_FILE="/etc/sudoers.d/dokku-${PLUGIN_COMMAND_PREFIX}"
@@ -56,8 +56,11 @@ EOL
      fi
    fi

+    chown "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "$SERVICE_ROOT/IMAGE" "$SERVICE_ROOT/IMAGE_VERSION"
+
    if [[ -f "$SERVICE_ROOT/${PLUGIN_VARIABLE}_CONFIG_OPTIONS" ]]; then
      mv "$SERVICE_ROOT/${PLUGIN_VARIABLE}_CONFIG_OPTIONS" "$SERVICE_ROOT/CONFIG_OPTIONS"
+      chown "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "$SERVICE_ROOT/CONFIG_OPTIONS"
    fi
  done
 }
--- a/plugin.toml
+++ b/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku redis service plugin"
-version = "1.18.0"
+version = "1.20.0"
 [plugin.config]
--- a/subcommands/clone
+++ b/subcommands/clone
@@ -14,7 +14,7 @@ service-clone-cmd() {
  #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 -m|--memory MEMORY, container memory limit in megabytes (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
--- a/subcommands/create
+++ b/subcommands/create
@@ -22,7 +22,7 @@ service-create-cmd() {
  #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 -m|--memory MEMORY, container memory limit in megabytes (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
Author	SHA1	Message	Date
Jose Diaz-Gonzalez	28af22d5ee	Release 1.20.0	2022-05-29 16:17:24 -04:00
Jose Diaz-Gonzalez	0bcf1a2e32	Merge pull request #177 from dokku/dependabot/docker/redis-7.0.0 chore(deps): bump redis from 6.2.6 to 7.0.0	2022-05-29 16:17:01 -04:00
dependabot[bot]	4b4f28a7db	chore(deps): bump redis from 6.2.6 to 7.0.0 Bumps redis from 6.2.6 to 7.0.0. --- updated-dependencies: - dependency-name: redis dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-28 15:12:49 +00:00
Jose Diaz-Gonzalez	b9071721c0	Release 1.19.2	2022-02-03 10:31:17 -05:00
Jose Diaz-Gonzalez	93415ced00	fix: always chown the image files	2022-02-03 10:30:27 -05:00
Jose Diaz-Gonzalez	ac4fee6acb	docs: clarify unit for container memory limit	2022-01-22 04:31:53 -05:00
Jose Diaz-Gonzalez	43348c4297	Release 1.19.1	2022-01-22 04:24:39 -05:00
Jose Diaz-Gonzalez	60d46920d4	fix: ensure service config files are owned by the dokku system user Refs dokku/dokku-postgres#245	2022-01-22 04:23:53 -05:00
Jose Diaz-Gonzalez	3dce1632fd	Release 1.19.0	2021-12-25 16:50:21 -05:00
Jose Diaz-Gonzalez	8c89467123	feat: add ability to skip restarts when linking datastores This allows multiple datastores to be linked at a given time, thus decreasing provisioning times.	2021-12-25 16:44:16 -05:00