Skip to content

Commit e3ff6f1

Browse files
committed
Reintroduce Redis and memcached, but only in the passenger-customizable and passenger-full images
1 parent 960585b commit e3ff6f1

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ build_full:
6060
echo ruby20=1 >> full_image/buildconfig
6161
echo ruby21=1 >> full_image/buildconfig
6262
echo nodejs=1 >> full_image/buildconfig
63+
echo redis=1 >> full_image/buildconfig
64+
echo memcached=1 >> full_image/buildconfig
6365
echo final=1 >> full_image/buildconfig
6466
docker build -t $(NAME)-full:$(VERSION) --rm full_image
6567

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,11 @@ For example:
236236
<a name="redis"></a>
237237
### Using Redis
238238

239+
**Redis is only available in the passenger-customizable and passenger-full images!**
240+
239241
Install and enable Redis:
240242

241-
# Opt-in for Redis if you're using the 'minimal' image.
243+
# Opt-in for Redis if you're using the 'customizable' image.
242244
#RUN /build/redis.sh
243245

244246
# Enable the Redis service.
@@ -249,9 +251,11 @@ The configuration file is in /etc/redis/redis.conf. Modify it as you see fit, bu
249251
<a name="memcached"></a>
250252
### Using memcached
251253

254+
**Memcached is only available in the passenger-customizable and passenger-full images!**
255+
252256
Install and enable memcached:
253257

254-
# Opt-in for Memcached if you're using the 'minimal' image.
258+
# Opt-in for Memcached if you're using the 'customizable' image.
255259
#RUN /build/memcached.sh
256260

257261
# Enable the memcached service.

image/install.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ if [[ "$ruby20" = 1 ]]; then /build/ruby2.0.sh; fi
1414
if [[ "$ruby21" = 1 ]]; then /build/ruby2.1.sh; fi
1515
if [[ "$python" = 1 ]]; then /build/python.sh; fi
1616
if [[ "$nodejs" = 1 ]]; then /build/nodejs.sh; fi
17+
if [[ "$redis" = 1 ]]; then /build/redis.sh; fi
18+
if [[ "$memcached" = 1 ]]; then /build/memcached.sh; fi
1719

1820
# Must be installed after Ruby, so that we don't end up with two Ruby versions.
1921
/build/nginx-passenger.sh

0 commit comments

Comments
 (0)