Release 1.19.3

fix: ensure service config files are owned by the dokku system user
Refs dokku/dokku-postgres#245
2022-01-22 04:24:29 -05:00 · 2022-01-22 04:23:52 -05:00 · 2022-01-22 04:12:12 -05:00 · 2022-01-22 03:53:46 -05:00 · 2022-01-22 03:53:31 -05:00 · 2022-01-21 03:09:01 +00:00
5 changed files with 17 additions and 7 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-FROM mysql:8.0.27
+FROM mysql:8.0.28
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # dokku mysql [![Build Status](https://img.shields.io/github/workflow/status/dokku/dokku-mysql/CI/master?style=flat-square "Build Status")](https://github.com/dokku/dokku-mysql/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 mysql plugin for dokku. Currently defaults to installing [mysql 8.0.27](https://hub.docker.com/_/mysql/).
+Official mysql plugin for dokku. Currently defaults to installing [mysql 8.0.28](https://hub.docker.com/_/mysql/).

 ## Requirements

--- 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/6
+++ b/6
@@ -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}"
@@ -53,11 +53,13 @@ EOL
      if [[ "$image" == *":"* ]]; then
        echo "${image%:*}" > "$SERVICE_ROOT/IMAGE"
        echo "${image##*:}" > "$SERVICE_ROOT/IMAGE_VERSION"
+        chown "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "$SERVICE_ROOT/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"
+      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 mysql service plugin"
-version = "1.18.0"
+version = "1.19.3"
 [plugin.config]
Author	SHA1	Message	Date
Jose Diaz-Gonzalez	1ddb84f358	Release 1.19.3	2022-01-22 04:24:29 -05:00
Jose Diaz-Gonzalez	aa8e145d9b	fix: ensure service config files are owned by the dokku system user Refs dokku/dokku-postgres#245	2022-01-22 04:23:52 -05:00
Jose Diaz-Gonzalez	33d6f2dc7b	Release 1.19.2	2022-01-22 04:12:12 -05:00
Jose Diaz-Gonzalez	f4f2ed9961	Release 1.19.1	2022-01-22 03:53:46 -05:00
Jose Diaz-Gonzalez	ef34f5ba55	Merge pull request #137 from dokku/dependabot/docker/mysql-8.0.28 chore(deps): bump mysql from 8.0.27 to 8.0.28	2022-01-22 03:53:31 -05:00
dependabot[bot]	474b39cf3c	chore(deps): bump mysql from 8.0.27 to 8.0.28 Bumps mysql from 8.0.27 to 8.0.28. --- updated-dependencies: - dependency-name: mysql dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-21 03:09:01 +00:00
Jose Diaz-Gonzalez	0a4ddba4d6	Release 1.19.0	2021-12-25 16:49:57 -05:00
Jose Diaz-Gonzalez	57db31f4ed	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:15 -05:00