Commit 9626fbd 1 parent 006332b commit 9626fbd Copy full SHA for 9626fbd
File tree 8 files changed +48
-8
lines changed
scripts/docker/base/ubuntu
8 files changed +48
-8
lines changed Original file line number Diff line number Diff line change @@ -177,9 +177,13 @@ CACHE_BUSTING_STATIC_ENABLED=False
177
177
178
178
MEMCACHED_ENABLED = False
179
179
MEMCACHED_BACKEND = django.core.cache.backends.memcached.MemcachedCache
180
- MEMCACHED_LOCATION = 127.0.0.1 :11211
180
+ MEMCACHED_LOCATION = memcached :11211
181
181
MEMCACHED_LOCK_EXPIRE = 3600
182
182
MEMCACHED_LOCK_TIMEOUT = 10
183
+ #
184
+ # Options for memcached binary, e.g. -vvv to log all requests and cache hits
185
+ #
186
+ MEMCACHED_OPTIONS =
183
187
184
188
MAX_DOCUMENT_SIZE = 200
185
189
CLIENT_RESULTS_LIMIT = 5
Original file line number Diff line number Diff line change @@ -177,9 +177,13 @@ CACHE_BUSTING_STATIC_ENABLED=False
177
177
178
178
MEMCACHED_ENABLED=False
179
179
MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
180
- MEMCACHED_LOCATION=127.0.0.1 :11211
180
+ MEMCACHED_LOCATION=memcached :11211
181
181
MEMCACHED_LOCK_EXPIRE=3600
182
182
MEMCACHED_LOCK_TIMEOUT=10
183
+ #
184
+ # Options for memcached binary, e.g. -vvv to log all requests and cache hits
185
+ #
186
+ MEMCACHED_OPTIONS=
183
187
184
188
MAX_DOCUMENT_SIZE=200
185
189
CLIENT_RESULTS_LIMIT=5
Original file line number Diff line number Diff line change @@ -177,9 +177,13 @@ CACHE_BUSTING_STATIC_ENABLED=False
177
177
178
178
MEMCACHED_ENABLED=False
179
179
MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
180
- MEMCACHED_LOCATION=127.0.0.1 :11211
180
+ MEMCACHED_LOCATION=memcached :11211
181
181
MEMCACHED_LOCK_EXPIRE=3600
182
182
MEMCACHED_LOCK_TIMEOUT=10
183
+ #
184
+ # Options for memcached binary, e.g. -vvv to log all requests and cache hits
185
+ #
186
+ MEMCACHED_OPTIONS=
183
187
184
188
MAX_DOCUMENT_SIZE=200
185
189
CLIENT_RESULTS_LIMIT=5
Original file line number Diff line number Diff line change @@ -186,9 +186,13 @@ CACHE_BUSTING_STATIC_ENABLED=False
186
186
187
187
MEMCACHED_ENABLED=False
188
188
MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
189
- MEMCACHED_LOCATION=127.0.0.1 :11211
189
+ MEMCACHED_LOCATION=memcached :11211
190
190
MEMCACHED_LOCK_EXPIRE=3600
191
191
MEMCACHED_LOCK_TIMEOUT=10
192
+ #
193
+ # Options for memcached binary, e.g. -vvv to log all requests and cache hits
194
+ #
195
+ MEMCACHED_OPTIONS=
192
196
193
197
MAX_DOCUMENT_SIZE=200
194
198
CLIENT_RESULTS_LIMIT=5
Original file line number Diff line number Diff line change @@ -68,6 +68,19 @@ services:
68
68
- statics:/mnt/volumes/statics
69
69
restart : unless-stopped
70
70
71
+ # memcached service
72
+ memcached :
73
+ image : memcached:alpine
74
+ container_name : memcached4${COMPOSE_PROJECT_NAME}
75
+ command : memcached ${MEMCACHED_OPTIONS}
76
+ restart : on-failure
77
+ healthcheck :
78
+ test : nc -z 127.0.0.1 11211
79
+ interval : 30s
80
+ timeout : 30s
81
+ retries : 5
82
+ start_period : 30s
83
+
71
84
# Gets and installs letsencrypt certificates
72
85
letsencrypt :
73
86
image : geonode/letsencrypt:latest
Original file line number Diff line number Diff line change @@ -46,6 +46,19 @@ services:
46
46
entrypoint : ["/usr/src/geonode/entrypoint.sh"]
47
47
command : " celery-cmd"
48
48
49
+ # memcached service
50
+ memcached :
51
+ image : memcached:alpine
52
+ container_name : memcached4${COMPOSE_PROJECT_NAME}
53
+ command : memcached ${MEMCACHED_OPTIONS}
54
+ restart : on-failure
55
+ healthcheck :
56
+ test : nc -z 127.0.0.1 11211
57
+ interval : 30s
58
+ timeout : 30s
59
+ retries : 5
60
+ start_period : 30s
61
+
49
62
# Nginx is serving django static and media files and proxies to django and geonode
50
63
geonode :
51
64
image : geonode/nginx:1.25.1
Original file line number Diff line number Diff line change @@ -16,7 +16,6 @@ invoke () {
16
16
17
17
# Start cron && memcached services
18
18
service cron restart
19
- service memcached restart
20
19
21
20
echo $" \n\n\n"
22
21
echo " -----------------------------------------------------"
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ RUN mkdir -p /usr/src/geonode
5
5
# # Enable postgresql-client-15
6
6
RUN apt-get update -y && apt-get install curl wget unzip gnupg2 -y
7
7
RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
8
- # will install python3.10
8
+ # will install python3.10
9
9
RUN apt-get install lsb-core -y
10
10
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" |tee /etc/apt/sources.list.d/pgdg.list
11
11
@@ -32,8 +32,7 @@ RUN pip3 install uwsgi \
32
32
&& pip install pip --upgrade \
33
33
&& pip install pygdal==$(gdal-config --version).* flower==0.9.4
34
34
35
- # Activate "memcached"
36
- RUN apt-get install -y memcached
35
+ # Install "sherlock" to be used with "memcached"
37
36
RUN pip install sherlock
38
37
39
38
# Cleanup apt update lists
You can’t perform that action at this time.
0 commit comments