Skip to content

Commit 705d90d

Browse files
author
Harvey
committed
pre-release of 7.2 container
1 parent 03b7770 commit 705d90d

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.1.12-fpm-alpine
1+
FROM php:7.2.0-fpm-alpine
22

33
LABEL maintainer="Ric Harvey <ric@ngd.io>"
44

@@ -10,7 +10,7 @@ ENV NGINX_VERSION 1.13.7
1010
ENV LUA_MODULE_VERSION 0.10.11
1111
ENV DEVEL_KIT_MODULE_VERSION 0.3.0
1212
ENV LUAJIT_LIB=/usr/lib
13-
ENV LUAJIT_INC=/usr/include/luajit-2.0
13+
ENV LUAJIT_INC=/usr/include/luajit-2.1
1414

1515
# resolves #166
1616
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
@@ -100,7 +100,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
100100
done; \
101101
test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
102102
gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
103-
&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
103+
#&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
104104
&& mkdir -p /usr/src \
105105
&& tar -zxC /usr/src -f nginx.tar.gz \
106106
&& tar -zxC /usr/src -f ndk.tar.gz \
@@ -158,7 +158,6 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
158158
&& ln -sf /dev/stderr /var/log/nginx/error.log
159159

160160
RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
161-
# sed -i -e "s/v3.4/edge/" /etc/apk/repositories && \
162161
echo /etc/apk/respositories && \
163162
apk update && \
164163
apk add --no-cache bash \
@@ -195,8 +194,9 @@ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repo
195194
--with-png-dir=/usr/include/ \
196195
--with-jpeg-dir=/usr/include/ && \
197196
#curl iconv session
198-
docker-php-ext-install pdo_mysql pdo_sqlite mysqli mcrypt gd exif intl xsl json soap dom zip opcache && \
199-
pecl install xdebug && \
197+
#docker-php-ext-install pdo_mysql pdo_sqlite mysqli mcrypt gd exif intl xsl json soap dom zip opcache && \
198+
docker-php-ext-install iconv pdo_mysql pdo_sqlite mysqli gd exif intl xsl json soap dom zip opcache && \
199+
#pecl install xdebug && \
200200
docker-php-source delete && \
201201
mkdir -p /etc/nginx && \
202202
mkdir -p /var/www/app && \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ If you have improvements or suggestions please open an issue or pull request on
1010
| Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version |
1111
|-----|-------|-----|--------|--------|
1212
| latest | Master Branch |1.13.7 | 7.1.12 | 3.4 |
13+
| 1.4.0 | 7.2 Branch |1.13.7 | 7.2.0 | 3.6 |
1314

1415
For other tags please see: [versioning](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/versioning.md)
1516

docs/versioning.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ We will use the [semver](http://ricostacruz.com/cheatsheets/semver.html) style n
1313

1414
The latest tag will always follow the master branch in git. the other versions will have releases attached.
1515

16+
#### PHP 7.1
17+
1618
| Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version | Container Scripts |
1719
|-----|-------|-----|--------|--------|--------|
1820
| latest | Master Branch |1.13.2 | 7.1.7 | 3.4 | 0.2.9 |
@@ -41,6 +43,12 @@ The latest tag will always follow the master branch in git. the other versions w
4143
| 1.3.9 | 1.3.9 |1.13.7 | 7.1.11 | 3.4 | 0.3.3 |
4244
| 1.3.10 | 1.3.10 |1.13.7 | 7.1.12 | 3.4 | 0.3.4 |
4345

46+
#### PHP 7.2
47+
48+
| Docker Tag | GitHub Release | Nginx Version | PHP Version | Alpine Version | Container Scripts |
49+
|-----|-------|-----|--------|--------|--------|
50+
| 1.4.0 | 7.2.0 |1.13.2 | 7.2.0 | 3.6 | 0.3.5 |
51+
4452
These tags will be created as releases on GitHub and as tags in docker hub.
4553

4654
### Unmaintained tags:

0 commit comments

Comments
 (0)