Skip to content
This repository was archived by the owner on Jan 6, 2021. It is now read-only.

Commit 1d70b1f

Browse files
authored
Merge pull request #347 from linuxserver/geoip
add php7-ldap, remove geoip v1
2 parents cc148d9 + 081c99e commit 1d70b1f

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ RUN \
2121
nginx \
2222
nginx-mod-http-echo \
2323
nginx-mod-http-fancyindex \
24-
nginx-mod-http-geoip \
2524
nginx-mod-http-geoip2 \
2625
nginx-mod-http-headers-more \
2726
nginx-mod-http-image-filter \
@@ -36,7 +35,6 @@ RUN \
3635
nginx-mod-mail \
3736
nginx-mod-rtmp \
3837
nginx-mod-stream \
39-
nginx-mod-stream-geoip \
4038
nginx-vim \
4139
php7-bz2 \
4240
php7-ctype \
@@ -46,6 +44,7 @@ RUN \
4644
php7-gd \
4745
php7-iconv \
4846
php7-intl \
47+
php7-ldap \
4948
php7-mcrypt \
5049
php7-memcached \
5150
php7-mysqli \

Dockerfile.aarch64

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ RUN \
2121
nginx \
2222
nginx-mod-http-echo \
2323
nginx-mod-http-fancyindex \
24-
nginx-mod-http-geoip \
2524
nginx-mod-http-geoip2 \
2625
nginx-mod-http-headers-more \
2726
nginx-mod-http-image-filter \
@@ -36,7 +35,6 @@ RUN \
3635
nginx-mod-mail \
3736
nginx-mod-rtmp \
3837
nginx-mod-stream \
39-
nginx-mod-stream-geoip \
4038
nginx-vim \
4139
php7-bz2 \
4240
php7-ctype \
@@ -46,6 +44,7 @@ RUN \
4644
php7-gd \
4745
php7-iconv \
4846
php7-intl \
47+
php7-ldap \
4948
php7-mcrypt \
5049
php7-memcached \
5150
php7-mysqli \

Dockerfile.armhf

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ RUN \
2121
nginx \
2222
nginx-mod-http-echo \
2323
nginx-mod-http-fancyindex \
24-
nginx-mod-http-geoip \
2524
nginx-mod-http-geoip2 \
2625
nginx-mod-http-headers-more \
2726
nginx-mod-http-image-filter \
@@ -36,7 +35,6 @@ RUN \
3635
nginx-mod-mail \
3736
nginx-mod-rtmp \
3837
nginx-mod-stream \
39-
nginx-mod-stream-geoip \
4038
nginx-vim \
4139
php7-bz2 \
4240
php7-ctype \
@@ -46,6 +44,7 @@ RUN \
4644
php7-gd \
4745
php7-iconv \
4846
php7-intl \
47+
php7-ldap \
4948
php7-mcrypt \
5049
php7-memcached \
5150
php7-mysqli \

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
257257

258258
## Versions
259259

260+
* **02.08.19:** - Add php7-ldap, remove geoip v1(deprecated).
260261
* **01.08.19:** - Mark https redirect block as default_server (effective only for new installs).
261262
* **31.07.19:** - Create GeoIP2 databse (libmaxminddb) during container start if it doesn't exist.
262263
* **30.07.19:** - Support main domain via duckdns validation.

readme-vars.yml

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ app_setup_nginx_reverse_proxy_block: ""
126126

127127
# changelog
128128
changelogs:
129+
- { date: "02.08.19:", desc: "Add php7-ldap, remove geoip v1(deprecated)." }
129130
- { date: "01.08.19:", desc: "Mark https redirect block as default_server (effective only for new installs)." }
130131
- { date: "31.07.19:", desc: "Create GeoIP2 databse (libmaxminddb) during container start if it doesn't exist." }
131132
- { date: "30.07.19:", desc: "Support main domain via duckdns validation." }

0 commit comments

Comments
 (0)