Release 1.26.2

fix: pull the new docker image when upgrading a service if DOCKER_IMAGE_PULL is not disabled
Refs dokku/dokku-clickhouse#51
2023-02-07 02:46:45 -05:00 · 2023-02-07 02:45:35 -05:00 · 2023-01-28 16:34:41 -05:00 · 2023-01-28 16:32:52 -05:00 · 2022-12-27 00:16:29 -05:00 · 2022-12-26 23:49:28 -05:00
5 changed files with 15 additions and 4 deletions
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# 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)
+# dokku mysql [![Build Status](https://img.shields.io/github/actions/workflow/status/dokku/dokku-mysql/ci.yml?branch=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.31](https://hub.docker.com/_/mysql/).

--- a/bin/generate
+++ b/bin/generate
@@ -35,7 +35,7 @@ def header(service):
    return " ".join(
        [
            f"# dokku {service}",
-            f'[![Build Status](https://img.shields.io/github/workflow/status/dokku/dokku-{service}/CI/master?style=flat-square "Build Status")](https://github.com/dokku/dokku-{service}/actions/workflows/ci.yml?query=branch%3Amaster)',
+            f'[![Build Status](https://img.shields.io/github/actions/workflow/status/dokku/dokku-{service}/ci.yml?branch=master&style=flat-square "Build Status")](https://github.com/dokku/dokku-{service}/actions/workflows/ci.yml?query=branch%3Amaster)',
            f'[![IRC Network](https://img.shields.io/badge/irc-libera-blue.svg?style=flat-square "IRC Libera")](https://webchat.libera.chat/?channels=dokku)',
        ]
    )
--- a/3
+++ b/3
@@ -3,7 +3,8 @@ _DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 export MYSQL_IMAGE=${MYSQL_IMAGE:="$(awk -F '[ :]' '{print $2}' "${_DIR}/Dockerfile")"}
 export MYSQL_IMAGE_VERSION=${MYSQL_IMAGE_VERSION:="$(awk -F '[ :]' '{print $3}' "${_DIR}/Dockerfile")"}
 export MYSQL_ROOT=${MYSQL_ROOT:="$DOKKU_LIB_ROOT/services/mysql"}
-export MYSQL_HOST_ROOT=${MYSQL_HOST_ROOT:=$MYSQL_ROOT}
+export DOKKU_LIB_HOST_ROOT=${DOKKU_LIB_HOST_ROOT:=$DOKKU_LIB_ROOT}
+export MYSQL_HOST_ROOT=${MYSQL_HOST_ROOT:="$DOKKU_LIB_HOST_ROOT/services/mysql"}

 export PLUGIN_UNIMPLEMENTED_SUBCOMMANDS=()
 export PLUGIN_COMMAND_PREFIX="mysql"
--- a/plugin.toml
+++ b/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku mysql service plugin"
-version = "1.26.0"
+version = "1.26.2"
 [plugin.config]
--- a/subcommands/upgrade
+++ b/subcommands/upgrade
@@ -38,6 +38,16 @@ service-upgrade-cmd() {
    return
  fi

+  if ! service_image_exists "$SERVICE"; then
+    if [[ "$PLUGIN_DISABLE_PULL" == "true" ]]; then
+      dokku_log_warn "${PLUGIN_DISABLE_PULL_VARIABLE} environment variable detected. Not running pull command." 1>&2
+      dokku_log_warn "   docker pull ${IMAGE}" 1>&2
+      dokku_log_warn "$PLUGIN_SERVICE service $SERVICE upgrade failed"
+      exit 1
+    fi
+    docker pull "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" || dokku_log_fail "$PLUGIN_SERVICE image $PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION pull failed"
+  fi
+
  service_commit_config "$SERVICE"

  dokku_log_info2 "Upgrading $SERVICE to $NEW_PLUGIN_IMAGE_TAG"
Author	SHA1	Message	Date
Jose Diaz-Gonzalez	91d3d884ba	Release 1.26.2	2023-02-07 02:46:45 -05:00
Jose Diaz-Gonzalez	e024260fe6	fix: pull the new docker image when upgrading a service if DOCKER_IMAGE_PULL is not disabled Refs dokku/dokku-clickhouse#51	2023-02-07 02:45:35 -05:00
Jose Diaz-Gonzalez	6f4728b1a7	Release 1.26.1	2023-01-28 16:34:41 -05:00
Jose Diaz-Gonzalez	88c60fd878	docs: update the ci workflow badge Refs https://github.com/badges/shields/issues/8671	2023-01-28 16:32:52 -05:00
josegonzalez	850ae71a0d	Merge pull request #151 from dokku/5468-dokku-lib-host-root feat: respect DOKKU_LIB_HOST_ROOT for mounted data volumes	2022-12-27 00:16:29 -05:00
Jose Diaz-Gonzalez	ae702634dd	feat: respect DOKKU_LIB_HOST_ROOT for mounted data volumes This change allows folks to change where dokku mounts data from for all official plugins, removing the need to specify the configuration on a one-off basis. Refs dokku/dokku#5468	2022-12-26 23:49:28 -05:00