Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
705d90d
pre-release of 7.2 container
Dec 2, 2017
6a980f4
add http2 to 7.2 version
Dec 5, 2017
60566f4
update versions
Dec 5, 2017
a257747
update to 7.2.4
Apr 23, 2018
f0cb171
update PHP to 7.2.6
Jun 17, 2018
67c48e6
Update links
Jun 17, 2018
6a018f0
update versions in repo
Jun 17, 2018
11fb462
add build script
Jun 17, 2018
7e9a379
fix ci/cd
Jun 17, 2018
6b2bd38
remove quotes
Jun 17, 2018
c70242a
tweak login line
Jun 17, 2018
ed8d3a1
final test before i rtfm
Jun 17, 2018
7448ba4
try with =
Jun 17, 2018
856b5a6
use --password-stdin
Jun 17, 2018
9ae0135
mix of everything
Jun 17, 2018
8dcf6aa
long format
Jun 17, 2018
ac9c702
modify docker login to include index
Jun 18, 2018
292a811
remove other login!
Jun 18, 2018
e605068
try and match tag/branch
Jun 18, 2018
0adc03d
fix typo
Jun 18, 2018
f2f09a8
add done
Jun 18, 2018
845eb2d
fix name logic
Jun 18, 2018
f7417ba
fox no login issue
Jun 18, 2018
ee1a725
try login in new place
Jun 18, 2018
c9256c5
add some debug
Jun 18, 2018
b1902de
more debug
Jun 18, 2018
d529d14
split jobs
Jun 18, 2018
0ea283f
change login line
Jun 18, 2018
8049fb8
fix from hebitrock @ github
Jun 18, 2018
15ccfe1
added xdebug from Thaine Rowley @ githubwq
Jun 18, 2018
b2ff931
switch to libre-sslwq
Jun 18, 2018
a2768df
readme fix from b1rdex @ github
Jun 18, 2018
1836953
http2 fix by Jonax @ github
Jun 18, 2018
17c7714
adding awesome tag/commit pull feature by Jaesin @ github
Jun 19, 2018
11a553a
Prep doc fo 1.5.2 release
Jun 19, 2018
0063728
PHP 7.2.7 release
Jun 29, 2018
daf4191
tidy up docker file and apk command
Jun 29, 2018
bcbe15e
Remove unused travis tests
Jun 29, 2018
51bbf4e
Tidy up 404 and fix php logging to stdout
Jun 30, 2018
5f0aad9
adding merge request !242
Jul 5, 2018
fe9e912
fixes !244
Jul 5, 2018
687a6a8
bumping php to 7.2.8
Jul 27, 2018
52da351
Update release for PHP 7.2.10
Sep 27, 2018
f2cc4b6
Allow user to change config and scripts folder
robertobermejo Sep 28, 2018
cb73d5c
Fix syntax error in example-service.yml
issmirnov Oct 13, 2018
3357f03
Merge branch 'patch-1' into 'master'
Oct 31, 2018
4e9c645
Add list of installed php modules
farfromunique Dec 20, 2018
7450186
Merge branch 'master' into custom_paths
robertobermejo Jan 29, 2019
90748a8
bumping nginx to 1.14.2 and php to 7.3.2
Mar 5, 2019
1658c95
update version in docs
Mar 5, 2019
f2d2779
adding libzip-dev
Mar 5, 2019
de6a2f6
fix xdebug and composer install
Mar 5, 2019
a645caa
Pushing version locked to alpine 3.9
Mar 6, 2019
0c439c3
Fix git directory access closes #251
Mar 6, 2019
97f859f
update incorrect version of php in docs
Mar 7, 2019
e9027cc
gnu-libiconv moved to community repo fixes build and closes #258
Mar 8, 2019
cf4cca2
fix docs [skip ci]
Mar 8, 2019
d99fb28
Bump to PHP 7.3.3
Mar 8, 2019
53d37e1
closes #240 closes !250
Mar 9, 2019
1e8f7e8
Fix xdebug always running
Mar 9, 2019
011a7d0
closes #212 adds option to install bz2 module
Mar 9, 2019
a8bd5c9
closes #249
Mar 9, 2019
3eef2ac
fix libs for some extensions
Mar 9, 2019
1d2d5c4
Merge branch 'module-description' into 'master'
Mar 10, 2019
5448e35
update docs
Mar 10, 2019
d4a77f9
add pgsql support closes #186
Mar 10, 2019
1100d19
adding redis extention
Mar 14, 2019
2f5577c
update versions
Mar 14, 2019
021730a
Line up icons in README [skip-ci]
Mar 14, 2019
a058553
line up badges
Mar 14, 2019
21cee8b
fix syntax
Mar 14, 2019
089ae67
Merge branch 'custom_paths' into 'master'
Mar 21, 2019
7d9882a
update docs
Mar 21, 2019
3423437
Merge branch 'master' of gitlab.com:ric_harvey/nginx-php-fpm
Mar 21, 2019
aa2c30a
Roll back CUSTOM root changes and bump PHP 7.3.4
Apr 5, 2019
eacb2ad
Move to nginx 1.16.0 new stable
Apr 26, 2019
ccc7508
Upgrade PHP to 7.3.5
May 4, 2019
0003610
add project url
Jun 5, 2019
2a03423
Create FUNDING.yml
richarvey Jun 5, 2019
6d9f8a4
Update FUNDING.yml
richarvey Jun 5, 2019
7d90473
Upgrade to PHP 7.3.6
Jun 5, 2019
228b923
Merge branch 'master' of github.com:richarvey/nginx-php-fpm
Jun 5, 2019
a705f20
update xdebug to 2.7.2 closes #276
Jun 20, 2019
3a3b50c
upgrade php to 7.3.7
Jul 24, 2019
5fe1b36
update to php 7.3.8
Aug 5, 2019
42a09f7
update docs
Aug 5, 2019
2e11991
feat: Support ngx_http_geoip2_module
marcuswelz Sep 1, 2019
addfa1a
config: expose GeoLite2 data via env vars
marcuswelz Sep 11, 2019
5d5a734
Upgrade alpine to 3.10, php 7.3.9, nginx 1.16.1 closes #287
Sep 17, 2019
c5b2833
Working towards issue #283 and using py3 however python2 is a burried
Sep 17, 2019
454fcd7
[skip ci] document update
Sep 17, 2019
defd1fd
Bugfix/fix xdebug remote prefix
guice Sep 17, 2019
da5eb4a
Merge branch 'bugfix/fix-xdebug-remote-prefix' into 'master'
Sep 17, 2019
11f83b6
Merge branch 'upstream-ngx_http_geoip2_module-support' into 'master'
Sep 17, 2019
218147f
Release for 1.8.2
Sep 17, 2019
5f7fcc2
updated to php 7.4.2 but geoip is broken - to fix
Feb 3, 2020
e0d5b45
Upgrade to php 7.4.5
Apr 20, 2020
50afaef
Fix readme [skip ci]
Apr 20, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: Support ngx_http_geoip2_module
  • Loading branch information
marcuswelz committed Sep 1, 2019
commit 2e1199157394f7558075ed93293eb73556bb4595
8 changes: 7 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ ENV php_vars /usr/local/etc/php/conf.d/docker-vars.ini
ENV NGINX_VERSION 1.16.0
ENV LUA_MODULE_VERSION 0.10.14
ENV DEVEL_KIT_MODULE_VERSION 0.3.0
ENV GEOIP2_MODULE_VERSION 3.2
ENV LUAJIT_LIB=/usr/lib
ENV LUAJIT_INC=/usr/include/luajit-2.1

Expand Down Expand Up @@ -64,6 +65,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
--with-http_v2_module \
--add-module=/usr/src/ngx_devel_kit-$DEVEL_KIT_MODULE_VERSION \
--add-module=/usr/src/lua-nginx-module-$LUA_MODULE_VERSION \
--add-module=/usr/src/ngx_http_geoip2_module-$GEOIP2_MODULE_VERSION \
" \
&& addgroup -S nginx \
&& adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \
Expand All @@ -81,12 +83,14 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
libxslt-dev \
gd-dev \
geoip-dev \
libmaxminddb-dev \
perl-dev \
luajit-dev \
&& curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz -o nginx.tar.gz \
&& curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc -o nginx.tar.gz.asc \
&& curl -fSL https://github.com/simpl/ngx_devel_kit/archive/v$DEVEL_KIT_MODULE_VERSION.tar.gz -o ndk.tar.gz \
&& curl -fSL https://github.com/openresty/lua-nginx-module/archive/v$LUA_MODULE_VERSION.tar.gz -o lua.tar.gz \
&& curl -fSL https://github.com/leev/ngx_http_geoip2_module/archive/$GEOIP2_MODULE_VERSION.tar.gz -o ngx_http_geoip2_module.tar.gz \
&& export GNUPGHOME="$(mktemp -d)" \
&& found=''; \
for server in \
Expand All @@ -105,7 +109,8 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& tar -zxC /usr/src -f nginx.tar.gz \
&& tar -zxC /usr/src -f ndk.tar.gz \
&& tar -zxC /usr/src -f lua.tar.gz \
&& rm nginx.tar.gz ndk.tar.gz lua.tar.gz \
&& tar -zxC /usr/src -f ngx_http_geoip2_module.tar.gz \
&& rm nginx.tar.gz ndk.tar.gz lua.tar.gz ngx_http_geoip2_module.tar.gz \
&& cd /usr/src/nginx-$NGINX_VERSION \
&& ./configure $CONFIG --with-debug \
&& make -j$(getconf _NPROCESSORS_ONLN) \
Expand Down Expand Up @@ -133,6 +138,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& strip /usr/sbin/nginx* \
&& strip /usr/lib/nginx/modules/*.so \
&& rm -rf /usr/src/nginx-$NGINX_VERSION \
&& rm -rf /usr/src/ngx_http_geoip2_module-$GEOIP2_MODULE_VERSION \
\
# Bring in gettext so we can get `envsubst`, then throw
# the rest away. To do this, we need to install `gettext`
Expand Down