Compare commits

..

24 Commits

Author SHA1 Message Date
Jose Diaz-Gonzalez
772f677d0f Release 1.40.0
Some checks failed
tagged-release / tagged-release (push) Has been cancelled
2025-05-22 00:28:28 -04:00
Jose Diaz-Gonzalez
078c2c58d4 Merge pull request #271 from dokku/dependabot/docker/redis-8.0.1
chore(deps): bump redis from 7.4.3 to 8.0.1
2025-05-22 00:27:11 -04:00
dependabot[bot]
6316eb7d7d chore(deps): bump redis from 7.4.3 to 8.0.1
Bumps redis from 7.4.3 to 8.0.1.

---
updated-dependencies:
- dependency-name: redis
  dependency-version: 8.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-14 15:03:49 +00:00
Jose Diaz-Gonzalez
7f254ed43e Release 1.39.4
Some checks failed
tagged-release / tagged-release (push) Has been cancelled
2025-04-28 23:56:59 -04:00
Jose Diaz-Gonzalez
07c5006247 Merge pull request #269 from dokku/revert-249-fix/url-checker
Revert "Fix url checker. Old code fail if any variables contain the alias or REDIS_URL"
2025-04-28 23:30:06 -04:00
Jose Diaz-Gonzalez
985ef3d19f Revert "Fix url checker. Old code fail if any variables contain the alias or REDIS_URL" 2025-04-28 23:29:58 -04:00
Jose Diaz-Gonzalez
02e828c6aa docs: update readme 2025-04-28 23:16:51 -04:00
Jose Diaz-Gonzalez
1f8a288d80 Merge pull request #249 from grizmio/fix/url-checker
Fix url checker. Old code fail if any variables contain the alias or REDIS_URL
2025-04-28 23:15:57 -04:00
Jose Diaz-Gonzalez
91734c6a15 Merge pull request #267 from dokku/dependabot/docker/redis-7.4.3
chore(deps): bump redis from 7.4.2 to 7.4.3
2025-04-28 23:13:27 -04:00
Jose Diaz-Gonzalez
6d0637c581 Merge pull request #265 from dokku/dependabot/github_actions/softprops/action-gh-release-2.2.2
chore(deps): bump softprops/action-gh-release from 2.2.1 to 2.2.2
2025-04-28 23:13:16 -04:00
Jose Diaz-Gonzalez
0a3a272b5e Merge pull request #268 from dokku/fix-typo
docs: fix typo in generated docs
2025-04-28 23:11:18 -04:00
Jose Diaz-Gonzalez
435ca9f8dc docs: correct typo in generated readme 2025-04-28 23:07:50 -04:00
dependabot[bot]
88ab215473 chore(deps): bump redis from 7.4.2 to 7.4.3
Bumps redis from 7.4.2 to 7.4.3.

---
updated-dependencies:
- dependency-name: redis
  dependency-version: 7.4.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-25 15:09:39 +00:00
dependabot[bot]
731429e175 chore(deps): bump softprops/action-gh-release from 2.2.1 to 2.2.2
Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v2.2.1...v2.2.2)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-version: 2.2.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-21 16:23:39 +00:00
Jose Diaz-Gonzalez
2211d7a095 Merge pull request #264 from dokku/update-workflows
chore: bump runs-on image from ubuntu-22.04 to ubuntu-24.04
2025-04-17 21:11:36 -04:00
Jose Diaz-Gonzalez
4567903371 fix: use maintained version of python 2025-04-17 20:46:21 -04:00
Jose Diaz-Gonzalez
cd1923eb9f chore: bump runs-on image from ubuntu-22.04 to ubuntu-24.04 2025-04-17 20:43:55 -04:00
Jose Diaz-Gonzalez
a488c74d28 Release 1.39.3
Some checks failed
tagged-release / tagged-release (push) Has been cancelled
2025-04-14 10:42:38 -04:00
Jose Diaz-Gonzalez
fc2e7ef408 Merge pull request #263 from kbuilds/fix-config-file-repo
Download the default redis config file from the official Redis repo
2025-04-14 10:41:28 -04:00
Kurtis Jensen
095eb6f89b Add -f flag to curl command
The `-f` flag will make curl fail if there is an http error. This should prevent this command from silently failing (and adding literal "404 error" string to the config file).
2025-04-09 17:21:26 -04:00
Kurtis Jensen
19a339f943 Download the default redis config file from the official Redis repository 2025-04-07 14:19:55 -04:00
Jose Diaz-Gonzalez
7ded70f338 Merge pull request #258 from dokku/maintained-action
ci: use maintained action for creating automated releases
2025-03-13 18:51:18 -05:00
Jose Diaz-Gonzalez
ff7c58599f ci: use maintained action for creating automated releases 2025-03-13 19:46:51 -04:00
Enzo Macari
62e132ed2d Fix url checker. Old code fail if any variables contain the alias so FOO_REDIS_URL would match and believe its already defined. 2024-08-05 12:54:44 -04:00
8 changed files with 18 additions and 17 deletions

View File

@@ -5,7 +5,7 @@ name: CI
on:
pull_request:
branches:
- '*'
- "*"
push:
branches:
- master
@@ -17,7 +17,7 @@ concurrency:
jobs:
unit-tests-master:
name: unit-tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
DOKKU_VERSION: master
@@ -28,7 +28,7 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: '3.7.x'
python-version: "3.13"
- run: make setup
@@ -59,7 +59,7 @@ 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
@@ -70,7 +70,7 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: '3.7.x'
python-version: "3.13"
- run: make setup

View File

@@ -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.2.2
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
generate_release_notes: true
make_latest: "true"

View File

@@ -1 +1 @@
FROM redis:7.4.2
FROM redis:8.0.1

View File

@@ -1,6 +1,6 @@
# dokku redis [![Build Status](https://img.shields.io/github/actions/workflow/status/dokku/dokku-redis/ci.yml?branch=master&style=flat-square "Build Status")](https://github.com/dokku/dokku-redis/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 redis plugin for dokku. Currently defaults to installing [redis 7.4.2](https://hub.docker.com/_/redis/).
Official redis plugin for dokku. Currently defaults to installing [redis 8.0.1](https://hub.docker.com/_/redis/).
## Requirements
@@ -345,7 +345,7 @@ Expose the service on the service's normal ports, allowing access to it from the
dokku redis:expose lollipop 6379
```
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 redis:expose lollipop 127.0.0.1:6379

2
Vagrantfile vendored
View File

@@ -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"

View File

@@ -48,7 +48,7 @@ service_create() {
touch "$LINKS_FILE"
if [[ -z $REDIS_CONFIG_PATH ]]; then
curl -sSL "https://raw.githubusercontent.com/antirez/redis/${PLUGIN_IMAGE_VERSION:0:3}/redis.conf" >"$SERVICE_ROOT/$PLUGIN_CONFIG_SUFFIX/redis.conf" || dokku_log_fail "Unable to download the default redis.conf to the config directory"
curl -sSLf "https://raw.githubusercontent.com/redis/redis/${PLUGIN_IMAGE_VERSION:0:3}/redis.conf" >"$SERVICE_ROOT/$PLUGIN_CONFIG_SUFFIX/redis.conf" || dokku_log_fail "Unable to download the default redis.conf to the config directory"
else
cp "$REDIS_CONFIG_PATH" "$SERVICE_ROOT/$PLUGIN_CONFIG_SUFFIX/redis.conf" || dokku_log_fail "Unable to copy the ${REDIS_CONFIG_PATH} to the config directory"
fi

View File

@@ -1,4 +1,4 @@
[plugin]
description = "dokku redis service plugin"
version = "1.39.2"
version = "1.40.0"
[plugin.config]

View File

@@ -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