Skip to content

Commit 215f366

Browse files
melle2williamdes
andcommitted
Enable remoteip for Apache
Co-Authored-by: William Desportes <williamdes@wdes.fr>
1 parent 272944c commit 215f366

4 files changed

Lines changed: 10 additions & 0 deletions

File tree

Dockerfile-debian.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ RUN set -ex; \
3737
| sort -u \
3838
| xargs -rt apt-mark manual; \
3939
\
40+
# start: Apache specific build
41+
a2enmod remoteip; \
42+
# end: Apache specific build
43+
\
4044
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
4145
rm -rf /var/lib/apt/lists/*; \
4246
ldd "$extdir"/*.so | grep -qzv "=> not found" || (echo "Sanity check failed: missing libraries:"; ldd "$extdir"/*.so | grep " => not found"; exit 1); \

apache/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ RUN set -ex; \
3838
| sort -u \
3939
| xargs -rt apt-mark manual; \
4040
\
41+
# start: Apache specific build
42+
a2enmod remoteip; \
43+
# end: Apache specific build
44+
\
4145
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
4246
rm -rf /var/lib/apt/lists/*; \
4347
ldd "$extdir"/*.so | grep -qzv "=> not found" || (echo "Sanity check failed: missing libraries:"; ldd "$extdir"/*.so | grep " => not found"; exit 1); \

fpm/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ RUN set -ex; \
3838
| sort -u \
3939
| xargs -rt apt-mark manual; \
4040
\
41+
\
4142
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
4243
rm -rf /var/lib/apt/lists/*; \
4344
ldd "$extdir"/*.so | grep -qzv "=> not found" || (echo "Sanity check failed: missing libraries:"; ldd "$extdir"/*.so | grep " => not found"; exit 1); \

update.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ function create_variant() {
6464
cp docker-entrypoint.sh "$variant/docker-entrypoint.sh"
6565
if [ "$variant" != "apache" ]; then
6666
sed -i "/^# start: Apache specific settings$/,/^# end: Apache specific settings$/d" "$variant/docker-entrypoint.sh"
67+
sed -i "/^\s*# start: Apache specific build$/,/^\s*# end: Apache specific build$/d" "$variant/Dockerfile"
6768
fi
6869

6970
# Copy config.inc.php

0 commit comments

Comments
 (0)