Skip to content

Commit

Permalink
Add :cached option for bind mounts by default. Update redis versions
Browse files Browse the repository at this point in the history
  • Loading branch information
csandanov committed May 2, 2020
1 parent 462da89 commit 369fee4
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ MARIADB_TAG=10.4-3.8.2
### --- REDIS ---

REDIS_TAG=5-3.3.0
#REDIS_TAG=4-3.3.0
#REDIS_TAG=6-3.3.0

### --- VARNISH ---

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The Ruby stack consist of the following containers:
| [Ruby] | 2.6, 2.5, 2.4 | `ruby` | [wodby/ruby] ||
| [Sidekiq] | | `sidekiq` | [wodby/ruby] | |
| [PostgreSQL] | 12, 11, 10, 9.x | `postgres` | [wodby/postgres] ||
| [Redis] | 5, 4 | `redis` | [wodby/redis] ||
| [Redis] | 6, 5 | `redis` | [wodby/redis] ||
| [MariaDB] | 10.4, 10.3, 10.2, 10.1 | `mariadb` | [wodby/mariadb] | |
| [Node.js] | 12, 10, 8 | `node` | [wodby/node] | |
| [Varnish] | 6.0, 4.1 | `varnish` | [wodby/varnish] | |
Expand Down
21 changes: 9 additions & 12 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,9 @@ services:
DB_NAME: $DB_NAME
DB_ADAPTER: $DB_ADAPTER
volumes:
- ./:/usr/src/app
## For macOS users (https://wodby.com/docs/stacks/ruby/local#docker-for-mac)
# - ./:/usr/src/app:cached # User-guided caching
# - docker-sync:/usr/src/app # Docker-sync
- ./:/usr/src/app:cached
## Alternative for macOS users: docker-sync https://wodby.com/docs/stacks/drupal/local#docker-for-mac
# - docker-sync:/usr/src/app

# sidekiq:
# build:
Expand All @@ -59,10 +58,9 @@ services:
# REDIS_URL: redis://redis:6379
# command: ["bundle", "exec", "sidekiq"]
# volumes:
# - ./:/usr/src/app
### For macOS users (https://wodby.com/docs/stacks/ruby/local#docker-for-mac)
## - ./:/usr/src/app:cached # User-guided caching
## - docker-sync:/usr/src/app # Docker-sync
# - ./:/usr/src/app:cached
## Alternative for macOS users: docker-sync https://wodby.com/docs/stacks/drupal/local#docker-for-mac
# - docker-sync:/usr/src/app

nginx:
image: wodby/nginx:$NGINX_TAG
Expand All @@ -75,10 +73,9 @@ services:
NGINX_BACKEND_HOST: ruby
NGINX_VHOST_PRESET: http-proxy
volumes:
- ./:/usr/src/app
# Options for macOS users (https://wodby.com/docs/stacks/ruby/local#docker-for-mac)
# - ./:/usr/src/app:cached # User-guided caching
# - docker-sync:/usr/src/app # Docker-sync
- ./:/usr/src/app:cached
## Alternative for macOS users: docker-sync https://wodby.com/docs/stacks/drupal/local#docker-for-mac
# - docker-sync:/usr/src/app
labels:
- "traefik.http.routers.${PROJECT_NAME}_nginx.rule=Host(`${PROJECT_BASE_URL}`)"

Expand Down
2 changes: 1 addition & 1 deletion tests/.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DB_PASSWORD=ruby
DB_HOST=postgres
DB_ADAPTER=postgresql

REDIS_TAG=5-3.3.0
REDIS_TAG=6-3.3.0
POSTGRES_TAG=11-1.9.3
NGINX_TAG=1.17-5.8.14

Expand Down

0 comments on commit 369fee4

Please sign in to comment.