Skip to content
Merged

3.1.0 #178

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,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.

Expand Down Expand Up @@ -337,6 +338,19 @@ However, if additional configuration (such as new buckets) are necessary before

Localstack is available at <http://localstack:4566> within the Docker network, and <http://localhost:4566> 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 <http://localhost:6389> on the host and <http://valkey:6379> inside the Docker network.

You can monitor Valkey activity using the CLI:

```shell
bashin redis
redis-cli monitor
```

#### Other files

**`/fragments/custom-provision.sh`**
Expand Down
4 changes: 2 additions & 2 deletions logic.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions scripts/docker/auth/openldap/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions scripts/docker/valkey/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM ghcr.io/valkey-io/valkey:8.1
6 changes: 6 additions & 0 deletions scripts/docker/valkey/compose-fragment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
services:
valkey:
container_name: valkey
build: ../scripts/docker/valkey/
ports:
- 6389:6379