Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
772f677d0f | ||
|
|
078c2c58d4 | ||
|
|
6316eb7d7d | ||
|
|
7f254ed43e | ||
|
|
07c5006247 | ||
|
|
985ef3d19f | ||
|
|
02e828c6aa | ||
|
|
1f8a288d80 | ||
|
|
91734c6a15 | ||
|
|
6d0637c581 | ||
|
|
0a3a272b5e | ||
|
|
435ca9f8dc | ||
|
|
88ab215473 | ||
|
|
731429e175 | ||
|
|
2211d7a095 | ||
|
|
4567903371 | ||
|
|
cd1923eb9f | ||
|
|
a488c74d28 | ||
|
|
fc2e7ef408 | ||
|
|
095eb6f89b | ||
|
|
19a339f943 | ||
|
|
7ded70f338 | ||
|
|
ff7c58599f | ||
|
|
62e132ed2d |
10
.github/workflows/ci.yml
vendored
10
.github/workflows/ci.yml
vendored
@@ -5,7 +5,7 @@ name: CI
|
|||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- '*'
|
- "*"
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
@@ -17,7 +17,7 @@ concurrency:
|
|||||||
jobs:
|
jobs:
|
||||||
unit-tests-master:
|
unit-tests-master:
|
||||||
name: unit-tests
|
name: unit-tests
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-24.04
|
||||||
env:
|
env:
|
||||||
DOKKU_VERSION: master
|
DOKKU_VERSION: master
|
||||||
|
|
||||||
@@ -28,7 +28,7 @@ jobs:
|
|||||||
|
|
||||||
- uses: actions/setup-python@v5
|
- uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: '3.7.x'
|
python-version: "3.13"
|
||||||
|
|
||||||
- run: make setup
|
- run: make setup
|
||||||
|
|
||||||
@@ -59,7 +59,7 @@ jobs:
|
|||||||
|
|
||||||
unit-tests-0_19_0:
|
unit-tests-0_19_0:
|
||||||
name: unit-tests-0.19.0
|
name: unit-tests-0.19.0
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-24.04
|
||||||
env:
|
env:
|
||||||
DOKKU_TAG: v0.19.0
|
DOKKU_TAG: v0.19.0
|
||||||
|
|
||||||
@@ -70,7 +70,7 @@ jobs:
|
|||||||
|
|
||||||
- uses: actions/setup-python@v5
|
- uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: '3.7.x'
|
python-version: "3.13"
|
||||||
|
|
||||||
- run: make setup
|
- run: make setup
|
||||||
|
|
||||||
|
|||||||
11
.github/workflows/tagged-release.yml
vendored
11
.github/workflows/tagged-release.yml
vendored
@@ -5,15 +5,16 @@ name: "tagged-release"
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- '*'
|
- "*"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
tagged-release:
|
tagged-release:
|
||||||
name: tagged-release
|
name: tagged-release
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-24.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: "marvinpinto/action-automatic-releases@v1.2.1"
|
- name: Release
|
||||||
|
uses: softprops/action-gh-release@v2.2.2
|
||||||
with:
|
with:
|
||||||
repo_token: "${{ secrets.GITHUB_TOKEN }}"
|
generate_release_notes: true
|
||||||
prerelease: false
|
make_latest: "true"
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
FROM redis:7.4.2
|
FROM redis:8.0.1
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# dokku redis [](https://github.com/dokku/dokku-redis/actions/workflows/ci.yml?query=branch%3Amaster) [](https://webchat.libera.chat/?channels=dokku)
|
# dokku redis [](https://github.com/dokku/dokku-redis/actions/workflows/ci.yml?query=branch%3Amaster) [](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
|
## 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
|
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
|
```shell
|
||||||
dokku redis:expose lollipop 127.0.0.1:6379
|
dokku redis:expose lollipop 127.0.0.1:6379
|
||||||
|
|||||||
2
Vagrantfile
vendored
2
Vagrantfile
vendored
@@ -1,7 +1,7 @@
|
|||||||
# -*- mode: ruby -*-
|
# -*- mode: ruby -*-
|
||||||
# vi: set ft=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"
|
BOX_MEMORY = ENV["BOX_MEMORY"] || "2048"
|
||||||
DOKKU_VERSION = "master"
|
DOKKU_VERSION = "master"
|
||||||
|
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ service_create() {
|
|||||||
touch "$LINKS_FILE"
|
touch "$LINKS_FILE"
|
||||||
|
|
||||||
if [[ -z $REDIS_CONFIG_PATH ]]; then
|
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
|
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"
|
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
|
fi
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku redis service plugin"
|
description = "dokku redis service plugin"
|
||||||
version = "1.39.2"
|
version = "1.40.0"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
|
|||||||
service-expose-cmd() {
|
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 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 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[@]}
|
#E dokku $PLUGIN_COMMAND_PREFIX:expose lollipop 127.0.0.1:${PLUGIN_DATASTORE_PORTS[@]}
|
||||||
#A service, service to run command against
|
#A service, service to run command against
|
||||||
#A ports, a list of ports to run against
|
#A ports, a list of ports to run against
|
||||||
|
|||||||
Reference in New Issue
Block a user