File tree Expand file tree Collapse file tree 3 files changed +17
-7
lines changed Expand file tree Collapse file tree 3 files changed +17
-7
lines changed Original file line number Diff line number Diff line change 1
1
---
2
+ - name : check if inside container
3
+ command : grep -qa container=lxc /proc/1/environ
4
+ register : container_env
5
+
6
+ - name : set fact inside container
7
+ set_fact :
8
+ inside_container : " {% if container_env.rc == 0 %}True{% else %}False{% endif %}"
9
+
2
10
- name : enable overcommit in sysctl
3
11
sysctl :
4
12
name : vm.overcommit_memory
5
13
value : " 1"
6
14
state : present
7
15
reload : yes
8
16
ignoreerrors : yes
9
- when : redis_travis_ci is not defined
17
+ when :
18
+ - redis_travis_ci is not defined
19
+ - container_env.rc != 0
10
20
11
21
- name : compile redis
12
22
shell : umask 0022 && make -j{{ ansible_processor_cores|default(1) + 1 }}{{ ' 32bit' if redis_make_32bit|bool else '' }}
Original file line number Diff line number Diff line change @@ -18,10 +18,10 @@ OOMScoreAdjust={{ redis_oom_score_adjust }}
18
18
{% endif %}
19
19
20
20
UMask=007
21
- PrivateTmp=yes
21
+ PrivateTmp={{ 'no' if inside_container else ' yes' }}
22
22
LimitNOFILE={{ redis_nofile_limit }}
23
- PrivateDevices=yes
24
- ProtectHome=yes
23
+ PrivateDevices={{ 'no' if inside_container else ' yes' }}
24
+ ProtectHome={{ 'no' if inside_container else ' yes' }}
25
25
ReadOnlyDirectories=/
26
26
ReadWriteDirectories=-{{ redis_dir }}
27
27
{% if redis_logfile != '""' %}
Original file line number Diff line number Diff line change @@ -18,10 +18,10 @@ OOMScoreAdjust={{ redis_sentinel_oom_score_adjust }}
18
18
{% endif %}
19
19
20
20
UMask=007
21
- PrivateTmp=yes
21
+ PrivateTmp={{ 'no' if inside_container else ' yes' }}
22
22
LimitNOFILE={{ redis_nofile_limit }}
23
- PrivateDevices=yes
24
- ProtectHome=yes
23
+ PrivateDevices={{ 'no' if inside_container else ' yes' }}
24
+ ProtectHome={{ 'no' if inside_container else ' yes' }}
25
25
ReadOnlyDirectories=/
26
26
ReadWriteDirectories=-{{ redis_sentinel_dir }}
27
27
{% if redis_sentinel_logfile != '""' %}
You can’t perform that action at this time.
0 commit comments