diff --git a/.env b/.env index f20a160..d117178 100644 --- a/.env +++ b/.env @@ -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 --- diff --git a/README.md b/README.md index 0b6b992..12f935d 100644 --- a/README.md +++ b/README.md @@ -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] | | diff --git a/docker-compose.yml b/docker-compose.yml index 99774c9..2c4de38 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: @@ -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 @@ -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}`)" diff --git a/tests/.env b/tests/.env index eb51b79..cc93008 100644 --- a/tests/.env +++ b/tests/.env @@ -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