From 5ea9c23e723e8ea244f55c49c3c2b959327c65ca Mon Sep 17 00:00:00 2001 From: Leigh Brooks Date: Wed, 7 May 2025 19:44:54 +0100 Subject: [PATCH 1/5] Added valkey commodity --- README.md | 14 ++++++++++++++ scripts/docker/valkey/Dockerfile | 1 + scripts/docker/valkey/compose-fragment.yml | 6 ++++++ 3 files changed, 21 insertions(+) create mode 100644 scripts/docker/valkey/Dockerfile create mode 100644 scripts/docker/valkey/compose-fragment.yml diff --git a/README.md b/README.md index b16871f..85ddf92 100644 --- a/README.md +++ b/README.md @@ -129,6 +129,7 @@ The list of allowable commodity values is: 15. activemq 16. ibmmq 17. localstack +18. valkey The file may optionally also indicate that one or more services are resource intensive ("expensive") when starting up. The dev env will start those containers seperately - 3 at a time - and wait until each are declared healthy (or crash and get restarted 10 times) before starting any more. @@ -336,6 +337,19 @@ However, if additional configuration (such as new buckets) are necessary before Localstack is available at  within the Docker network, and on the host. +###### Valkey + +[Valkey](https://valkey.io/) is a key-value store forked from Redis. + +There are no fragments needed when using this. Valkey will be available at on the host and inside the Docker network. + +You can monitor Valkey activity using the CLI: + +```shell +bashin redis +redis-cli monitor +``` + #### Other files **`/fragments/custom-provision.sh`** diff --git a/scripts/docker/valkey/Dockerfile b/scripts/docker/valkey/Dockerfile new file mode 100644 index 0000000..0b1fe3e --- /dev/null +++ b/scripts/docker/valkey/Dockerfile @@ -0,0 +1 @@ +FROM ghcr.io/valkey-io/valkey:8.1-debian diff --git a/scripts/docker/valkey/compose-fragment.yml b/scripts/docker/valkey/compose-fragment.yml new file mode 100644 index 0000000..7464b04 --- /dev/null +++ b/scripts/docker/valkey/compose-fragment.yml @@ -0,0 +1,6 @@ +services: + valkey: + container_name: valkey + build: ../scripts/docker/valkey/ + ports: + - 6389:6379 From 0fcf990e550eee389fc5569374ac6f5e3e006cac Mon Sep 17 00:00:00 2001 From: Leigh Brooks Date: Wed, 7 May 2025 20:32:25 +0100 Subject: [PATCH 2/5] switch to debian base image for valkey --- scripts/docker/valkey/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/valkey/Dockerfile b/scripts/docker/valkey/Dockerfile index 0b1fe3e..9cc8e7d 100644 --- a/scripts/docker/valkey/Dockerfile +++ b/scripts/docker/valkey/Dockerfile @@ -1 +1 @@ -FROM ghcr.io/valkey-io/valkey:8.1-debian +FROM ghcr.io/valkey-io/valkey:8.1 From b6dcceb82dd4842c339f642cacae93d98c31763a Mon Sep 17 00:00:00 2001 From: Simon Chapman Date: Mon, 7 Jul 2025 11:59:39 +0100 Subject: [PATCH 3/5] Fix syntax error When using local dev-env-config option services should be applications --- logic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logic.rb b/logic.rb index dd4aa0b..39c376d 100644 --- a/logic.rb +++ b/logic.rb @@ -143,7 +143,7 @@ run_command("mkdir #{DEV_ENV_CONFIG_DIR}") # Create a configuration.yml with an empty services array File.open("#{DEV_ENV_CONFIG_DIR}/configuration.yml", 'w') do |file| - file.write("---\nservices: {}\n") + file.write("---\napplications: {}\n") end puts colorize_green("You can start adding apps to #{DEV_ENV_CONFIG_DIR}/configuration.yml") exit 1 From ebc4771e186f793cd79667cea09245faaa350799 Mon Sep 17 00:00:00 2001 From: Simon Chapman Date: Tue, 15 Jul 2025 14:13:45 +0100 Subject: [PATCH 4/5] Fix openldap Debian 10 mirrors not working any more --- scripts/docker/auth/openldap/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/docker/auth/openldap/Dockerfile b/scripts/docker/auth/openldap/Dockerfile index d19c64e..5e63494 100644 --- a/scripts/docker/auth/openldap/Dockerfile +++ b/scripts/docker/auth/openldap/Dockerfile @@ -1,12 +1,10 @@ -FROM quay.io/lib/debian:10 +FROM quay.io/lib/debian:11 # For some reason some people get hash mismatch issues. This tries to resolve that. # See https://askubuntu.com/questions/1121093/hash-sum-mismatches-in-18-04-on-laptop-and-in-docker RUN printf "Acquire::http::Pipeline-Depth 0;\nAcquire::http::No-Cache true;\nAcquire::BrokenProxy true;" > /etc/apt/apt.conf.d/99fixbadproxy -RUN sed -i -e 's%http://deb.debian.org/debian-security%http://security.debian.org/debian-security%g' /etc/apt/sources.list && \ - sed -i -e 's%http://deb.debian.org/debian%http://ftp.uk.debian.org/debian%g' /etc/apt/sources.list && \ - apt-get update && \ +RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y slapd ldap-utils ldapscripts && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /etc/ldap/schema From 9117ed9b444d009570af8a317fb8a8c07566507e Mon Sep 17 00:00:00 2001 From: Simon Chapman Date: Tue, 15 Jul 2025 14:14:21 +0100 Subject: [PATCH 5/5] 3.1.0 --- logic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logic.rb b/logic.rb index 39c376d..da7d1df 100644 --- a/logic.rb +++ b/logic.rb @@ -75,7 +75,7 @@ # Does a version check and self-update if required if options['self_update'] - this_version = '3.0.0' + this_version = '3.1.0' puts colorize_lightblue("This is a universal dev env (version #{this_version})") # Skip version check if not on master (prevents infinite loops if you're in a branch that isn't up to date with the # latest release code yet)