Skip to content

Commit

Permalink
Add deps
Browse files Browse the repository at this point in the history
  • Loading branch information
timkelty committed Jan 15, 2024
1 parent a7c3b2a commit b9ccd97
Show file tree
Hide file tree
Showing 8 changed files with 101 additions and 3 deletions.
5 changes: 5 additions & 0 deletions craft-cloud/commands/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# #ddev-generated
# Everything in the commands directory needs LF line-endings
# Not CRLF as from Windows.
# bash especially just can't cope if it finds CRLF in a script.
* -text eol=lf
7 changes: 7 additions & 0 deletions craft-cloud/commands/minio/mc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env bash
#ddev-generated
## Description: Run MinIO Client inside the minio container
## Usage: mc [flags] [args]
## Example: "mc admin bucket"

mc "$@"
7 changes: 7 additions & 0 deletions craft-cloud/commands/redis/redis-cli
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash
#ddev-generated
## Description: Run redis-cli inside the redis container
## Usage: redis-cli [flags] [args]
## Example: "ddev redis-cli KEYS *" or "ddev redis-cli INFO" or "ddev redis-cli --version"

redis-cli -p 6379 -h redis $@
12 changes: 12 additions & 0 deletions craft-cloud/minio/mc-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": "10",
"aliases": {
"minio": {
"url": "http://localhost:10101",
"accessKey": "ddevminio",
"secretKey": "ddevminio",
"api": "s3v4",
"path": "auto"
}
}
}
File renamed without changes.
53 changes: 53 additions & 0 deletions docker-compose.craft-cloud.minio.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#ddev-generated
# MinIO addon for DDEV - Base file
services:
minio:
container_name: ddev-${DDEV_SITENAME}-minio
build:
context: .minioImageBuild
hostname: ddev-${DDEV_SITENAME}-minio
environment:
MINIO_VOLUMES: "/data"
MINIO_ROOT_USER: ddevminio
MINIO_ROOT_PASSWORD: ddevminio
command: >
server
--console-address
:9090
--address
:10101
volumes:
- "minio:/data"
- ".:/mnt/ddev_config"
- ddev-global-cache:/mnt/ddev-global-cache
- "./craft-cloud/minio/mc-config.json:/root/.mc/config.json"
expose:
- "9000"
- "10101"
networks:
- default
- ddev_default
labels:
com.ddev.site-name: ${DDEV_SITENAME}
com.ddev.approot: ${DDEV_APPROOT}
external_links:
- ddev-router:${DDEV_SITENAME}.${DDEV_TLD}
deploy:
resources:
limits:
cpus: "2"
memory: "1024M"
reservations:
cpus: "1"
memory: "512M"
restart: "no"
healthcheck:
interval: 120s
timeout: 2s
retries: 1

volumes:
minio:
name: ddev-${DDEV_SITENAME}-minio
labels:
com.ddev.site-name: ${DDEV_SITENAME}
14 changes: 14 additions & 0 deletions docker-compose.craft-cloud.redis.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#ddev-generated
services:
redis:
container_name: ddev-${DDEV_SITENAME}-redis
image: redis:7
labels:
com.ddev.site-name: ${DDEV_SITENAME}
com.ddev.approot: $DDEV_APPROOT
volumes:
- ".:/mnt/ddev_config"
- "redis:/data"

volumes:
redis:
6 changes: 3 additions & 3 deletions install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ pre_install_actions:
# if it hasn't been modified by the user.
# DDEV environment variables can be interpolated into these filenames
project_files:
- docker-compose.bref.yaml
- docker-compose.craft-cloud.bref.yaml
- docker-compose.craft-cloud.minio.yaml
- docker-compose.craft-cloud.redis.yaml
- craft-cloud

# List of files and directories that are copied into the global .ddev directory
Expand All @@ -69,8 +71,6 @@ global_files:

# List of add-on names that this add-on depends on
dependencies:
- ddev/ddev-redis
- oblakstudio/ddev-minio

# DDEV environment variables can be interpolated into these actions
post_install_actions:
Expand Down

0 comments on commit b9ccd97

Please sign in to comment.